mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-26 08:53:21 +00:00
cmake: fix CMAKE_FIND_FRAMEWORK
This commit is contained in:
parent
2131a1df39
commit
3106c30903
@ -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"
|
||||
|
@ -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
|
||||
;
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user