diff options
| author | Nikolay Korotkiy <sikmir@gmail.com> | 2020-07-28 19:05:43 +0300 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2020-08-29 13:37:56 +0200 |
| commit | 3106c309038de3503e655073b0be376b9ba57e82 (patch) | |
| tree | 6f3f1f5d1a805ebba05e6a23cb6a87ca4bf45770 | |
| parent | 2131a1df3926f670717a7d4f8c82e5fbd392de87 (diff) | |
| download | nixpkgs-3106c309038de3503e655073b0be376b9ba57e82.tar nixpkgs-3106c309038de3503e655073b0be376b9ba57e82.tar.gz nixpkgs-3106c309038de3503e655073b0be376b9ba57e82.tar.bz2 nixpkgs-3106c309038de3503e655073b0be376b9ba57e82.tar.lz nixpkgs-3106c309038de3503e655073b0be376b9ba57e82.tar.xz nixpkgs-3106c309038de3503e655073b0be376b9ba57e82.tar.zst nixpkgs-3106c309038de3503e655073b0be376b9ba57e82.zip | |
cmake: fix CMAKE_FIND_FRAMEWORK
5 files changed, 3 insertions, 9 deletions
diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix index 39f8694dd17..540fa271897 100644 --- a/pkgs/applications/gis/openorienteering-mapper/default.nix +++ b/pkgs/applications/gis/openorienteering-mapper/default.nix @@ -56,8 +56,6 @@ mkDerivation rec { "-DLICENSING_PROVIDER:BOOL=OFF" "-DMapper_MANUAL_QTHELP:BOOL=OFF" ] ++ stdenv.lib.optionals stdenv.isDarwin [ - # Usually enabled on Darwin - "-DCMAKE_FIND_FRAMEWORK=never" # FindGDAL is broken and always finds /Library/Framework unless this is # specified "-DGDAL_INCLUDE_DIR=${gdal}/include" diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 69c9aeaf891..ea00669006b 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -44,7 +44,7 @@ let "-DENABLE_JAVASCRIPT=OFF" # Requires v8 <= 3.24.3, https://github.com/weechat/weechat/issues/360 "-DENABLE_PHP=OFF" ] - ++ optionals stdenv.isDarwin ["-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib" "-DCMAKE_FIND_FRAMEWORK=LAST"] + ++ optionals stdenv.isDarwin ["-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib"] ++ map (p: "-D${p.cmakeFlag}=" + (if p.enabled then "ON" else "OFF")) plugins ; diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix index a0a558f5ed8..543545de263 100644 --- a/pkgs/applications/office/ledger/default.nix +++ b/pkgs/applications/office/ledger/default.nix @@ -27,10 +27,6 @@ stdenv.mkDerivation rec { "-DCMAKE_INSTALL_LIBDIR=lib" "-DBUILD_DOCS:BOOL=ON" (lib.optionalString usePython "-DUSE_PYTHON=true") - ] ++ lib.optionals (usePython && stdenv.isDarwin) [ - # Fix python lookup on Darwin. Not necessary after - # https://github.com/NixOS/nixpkgs/pull/94090 lands in master - "-DPython_ROOT_DIR=${python}" ]; # by default, it will query the python interpreter for it's sitepackages location diff --git a/pkgs/development/compilers/mozart/default.nix b/pkgs/development/compilers/mozart/default.nix index d2c2d98e411..025652c7492 100644 --- a/pkgs/development/compilers/mozart/default.nix +++ b/pkgs/development/compilers/mozart/default.nix @@ -60,7 +60,7 @@ in stdenv.mkDerivation rec { # gcc together as compilers and we need clang for the sources generation. # However, clang emits tons of warnings about gcc's atomic-base library. "-DCMAKE_CXX_FLAGS=-Wno-braced-scalar-init" - ] ++ lib.optional stdenv.isDarwin "-DCMAKE_FIND_FRAMEWORK=LAST"; + ]; fixupPhase = '' wrapProgram $out/bin/oz --set OZEMACS ${emacs}/bin/emacs diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index 6ae560c5645..0bb695615fc 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -48,7 +48,7 @@ cmakeConfigurePhase() { # on macOS we want to prefer Unix-style headers to Frameworks # because we usually do not package the framework - cmakeFlags="-DCMAKE_FIND_FRAMEWORK=last $cmakeFlags" + cmakeFlags="-DCMAKE_FIND_FRAMEWORK=LAST $cmakeFlags" # on macOS i686 was only relevant for 10.5 or earlier. cmakeFlags="-DCMAKE_OSX_ARCHITECTURES=x86_64 $cmakeFlags" |