diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2018-05-15 16:31:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-15 16:31:17 -0400 |
| commit | ce018be2d6ce20960b52ebc4bd86e64a5a58ce29 (patch) | |
| tree | ccf7a98f59f9a9152b8cd73d2861fcd701fee9fe /pkgs/development | |
| parent | 0ce8cb8d492281f9c92d0c3fb7d9c3c7958b5634 (diff) | |
| parent | 0ff650a39206141adca544183a2541179e85c412 (diff) | |
| download | nixlib-ce018be2d6ce20960b52ebc4bd86e64a5a58ce29.tar nixlib-ce018be2d6ce20960b52ebc4bd86e64a5a58ce29.tar.gz nixlib-ce018be2d6ce20960b52ebc4bd86e64a5a58ce29.tar.bz2 nixlib-ce018be2d6ce20960b52ebc4bd86e64a5a58ce29.tar.lz nixlib-ce018be2d6ce20960b52ebc4bd86e64a5a58ce29.tar.xz nixlib-ce018be2d6ce20960b52ebc4bd86e64a5a58ce29.tar.zst nixlib-ce018be2d6ce20960b52ebc4bd86e64a5a58ce29.zip | |
Merge pull request #40566 from obsidiansystems/strictDeps-for-18.03
cmake: Fix build and setup hook
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/tools/build-managers/cmake/default.nix | 9 | ||||
| -rwxr-xr-x | pkgs/development/tools/build-managers/cmake/setup-hook.sh | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 7f7948bc3231..3871600f4463 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -82,6 +82,10 @@ stdenv.mkDerivation rec { configureFlags = [ "--docdir=share/doc/${name}" + ] ++ (if useSharedLibraries then [ "--no-system-jsoncpp" "--system-libs" ] else [ "--no-system-libs" ]) # FIXME: cleanup + ++ optional (useQt4 || withQt5) "--qt-gui" + ++ [ + "--" # We should set the proper `CMAKE_SYSTEM_NAME`. # http://www.cmake.org/Wiki/CMake_Cross_Compiling # @@ -93,10 +97,7 @@ stdenv.mkDerivation rec { "-DCMAKE_AR=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar" "-DCMAKE_RANLIB=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib" "-DCMAKE_STRIP=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip" - ] ++ (if useSharedLibraries then [ "--no-system-jsoncpp" "--system-libs" ] else [ "--no-system-libs" ]) # FIXME: cleanup - ++ optional (useQt4 || withQt5) "--qt-gui" - ++ ["--"] - ++ optionals (!useNcurses) [ "-DBUILD_CursesDialog=OFF" ]; + ] ++ optionals (!useNcurses) [ "-DBUILD_CursesDialog=OFF" ]; dontUseCmakeConfigure = true; enableParallelBuilding = true; diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index 733dd9482200..8e3993fadc14 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -38,7 +38,7 @@ cmakeConfigurePhase() { cmakeFlags="-DCMAKE_CXX_COMPILER=$CXX $cmakeFlags" cmakeFlags="-DCMAKE_C_COMPILER=$CC $cmakeFlags" cmakeFlags="-DCMAKE_AR=$(command -v $AR) $cmakeFlags" - cmakeFlags="-DCMAKE_RANLIB=$(command -v $RANLAB) $cmakeFlags" + cmakeFlags="-DCMAKE_RANLIB=$(command -v $RANLIB) $cmakeFlags" cmakeFlags="-DCMAKE_STRIP=$(command -v $STRIP) $cmakeFlags" # on macOS we want to prefer Unix-style headers to Frameworks |