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

This reverts commit e36b1d4ad1, reversing
changes made to c2ea7318be.

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

View file

@ -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"

View file

@ -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
;

View file

@ -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

View file

@ -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"