Skip to content

Commit

Permalink
Revert "Merge pull request #94090 from sikmir/fix-cmake-hook"
Browse files Browse the repository at this point in the history
This reverts commit e36b1d4, reversing
changes made to c2ea731.

Should go to staging.
  • Loading branch information
matthewbauer committed Jul 29, 2020
1 parent e36b1d4 commit 22f82fc
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 deletions.
2 changes: 2 additions & 0 deletions pkgs/applications/gis/openorienteering-mapper/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ 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"
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/networking/irc/weechat/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
++ 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
;

Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/compilers/mozart/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,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
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/tools/build-managers/cmake/setup-hook.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 22f82fc

Please sign in to comment.