public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Merge pull request #94090 from sikmir/fix-cmake-hook"

Browse Source 
This reverts commit e36b1d4ad14cca19a82d586c67a71665a5ed3830, reversing
changes made to c2ea7318bef4f50a6d1e07b54a479698ada1e7d4.

Should go to staging.
This commit is contained in:
Matthew Bauer 2020-07-29 18:20:56 -05:00
parent e36b1d4ad1
commit 22f82fc8ca
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/gis/openorienteering-mapper/default.nix
View File

@ -56,6 +56,8 @@ mkDerivation rec {
"-DLICENSING_PROVIDER:BOOL=OFF" "-DLICENSING_PROVIDER:BOOL=OFF"
"-DMapper_MANUAL_QTHELP:BOOL=OFF" "-DMapper_MANUAL_QTHELP:BOOL=OFF"
] ++ stdenv.lib.optionals stdenv.isDarwin [ ] ++ stdenv.lib.optionals stdenv.isDarwin [
# Usually enabled on Darwin
"-DCMAKE_FIND_FRAMEWORK=never"
# FindGDAL is broken and always finds /Library/Framework unless this is # FindGDAL is broken and always finds /Library/Framework unless this is
# specified # specified
"-DGDAL_INCLUDE_DIR=${gdal}/include" "-DGDAL_INCLUDE_DIR=${gdal}/include"

2
pkgs/applications/networking/irc/weechat/default.nix
View File

@ -44,7 +44,7 @@ let
"-DENABLE_JAVASCRIPT=OFF" # Requires v8 <= 3.24.3, https://github.com/weechat/weechat/issues/360 "-DENABLE_JAVASCRIPT=OFF" # Requires v8 <= 3.24.3, https://github.com/weechat/weechat/issues/360
"-DENABLE_PHP=OFF" "-DENABLE_PHP=OFF"
] ]
++ optionals stdenv.isDarwin ["-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib"] ++ optionals stdenv.isDarwin ["-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib" "-DCMAKE_FIND_FRAMEWORK=LAST"]
++ map (p: "-D${p.cmakeFlag}=" + (if p.enabled then "ON" else "OFF")) plugins ++ map (p: "-D${p.cmakeFlag}=" + (if p.enabled then "ON" else "OFF")) plugins
; ;

2
pkgs/development/compilers/mozart/default.nix
View File

@ -61,7 +61,7 @@ in stdenv.mkDerivation rec {
# gcc together as compilers and we need clang for the sources generation. # gcc together as compilers and we need clang for the sources generation.
# However, clang emits tons of warnings about gcc's atomic-base library. # However, clang emits tons of warnings about gcc's atomic-base library.
"-DCMAKE_CXX_FLAGS=-Wno-braced-scalar-init" "-DCMAKE_CXX_FLAGS=-Wno-braced-scalar-init"
]; ] ++ lib.optional stdenv.isDarwin "-DCMAKE_FIND_FRAMEWORK=LAST";
fixupPhase = '' fixupPhase = ''
wrapProgram $out/bin/oz --set OZEMACS ${emacs}/bin/emacs wrapProgram $out/bin/oz --set OZEMACS ${emacs}/bin/emacs

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

@ -48,7 +48,7 @@ cmakeConfigurePhase() {
# on macOS we want to prefer Unix-style headers to Frameworks # on macOS we want to prefer Unix-style headers to Frameworks
# because we usually do not package the framework # 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. # on macOS i686 was only relevant for 10.5 or earlier.
cmakeFlags="-DCMAKE_OSX_ARCHITECTURES=x86_64 $cmakeFlags" cmakeFlags="-DCMAKE_OSX_ARCHITECTURES=x86_64 $cmakeFlags"