commit ce018be2d6ce20960b52ebc4bd86e64a5a58ce29 · pyrox.dev/nixpkgs

+5 -4

pkgs/development/tools/build-managers/cmake/default.nix

···

       82
       82
        
       

     

       83
       83
        
         configureFlags = [

     

       84
       84
        
           "--docdir=share/doc/${name}"

     

       85
       85
       +
         ] ++ (if useSharedLibraries then [ "--no-system-jsoncpp" "--system-libs" ] else [ "--no-system-libs" ]) # FIXME: cleanup

     

       86
       86
       +
           ++ optional (useQt4 || withQt5) "--qt-gui"

     

       87
       87
       +
           ++ [

     

       88
       88
       +
           "--"

     

       85
       89
        
           # We should set the proper `CMAKE_SYSTEM_NAME`.

     

       86
       90
        
           # http://www.cmake.org/Wiki/CMake_Cross_Compiling

     

       87
       91
        
           #

     
···

       93
       97
        
           "-DCMAKE_AR=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar"

     

       94
       98
        
           "-DCMAKE_RANLIB=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib"

     

       95
       99
        
           "-DCMAKE_STRIP=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip"

     

       96
       96
       -
          ] ++ (if useSharedLibraries then [ "--no-system-jsoncpp" "--system-libs" ] else [ "--no-system-libs" ]) # FIXME: cleanup

     

       97
       97
       -
            ++ optional (useQt4 || withQt5) "--qt-gui"

     

       98
       98
       -
            ++ ["--"]

     

       99
       99
       -
            ++ optionals (!useNcurses) [ "-DBUILD_CursesDialog=OFF" ];

     

       100
       100
       +
         ] ++ optionals (!useNcurses) [ "-DBUILD_CursesDialog=OFF" ];

     

       100
       101
        
       

     

       101
       102
        
         dontUseCmakeConfigure = true;

     

       102
       103
        
         enableParallelBuilding = true;

+1 -1

pkgs/development/tools/build-managers/cmake/setup-hook.sh

···

       38
       38
        
           cmakeFlags="-DCMAKE_CXX_COMPILER=$CXX $cmakeFlags"

     

       39
       39
        
           cmakeFlags="-DCMAKE_C_COMPILER=$CC $cmakeFlags"

     

       40
       40
        
           cmakeFlags="-DCMAKE_AR=$(command -v $AR) $cmakeFlags"

     

       41
       41
       -
           cmakeFlags="-DCMAKE_RANLIB=$(command -v $RANLAB) $cmakeFlags"

     

       41
       41
       +
           cmakeFlags="-DCMAKE_RANLIB=$(command -v $RANLIB) $cmakeFlags"

     

       42
       42
        
           cmakeFlags="-DCMAKE_STRIP=$(command -v $STRIP) $cmakeFlags"

     

       43
       43
        
       

     

       44
       44
        
           # on macOS we want to prefer Unix-style headers to Frameworks