git.iko.soy/typeable/nixpkgs
on master help sign in
treewide: get rid of osx cmake flags

Flags that we now set globally: - CMAKE_OSX_SYSROOT - CMAKE_OSX_DEPLOYMENT_TARGET can now be removed. (cherry picked from commit 8742d5de30dfe2447c0fb56a2e7410b402effc80)

commit21eeb00a08d53df3e55f98d0fd09ef3ba9db73af authorMatthew Bauer <mjbauer95@gmail.com> dateSun 4 Nov 2018, 20:15 (8 years ago) parentd94d220
4 files changed+1−12
pkgs/development/libraries/libui/default.nix+1−5 pkgs/development/libraries/pcl/default.nix−1 pkgs/development/libraries/vtk/default.nix−2 pkgs/development/mobile/xpwn/default.nix−4
pkgs/development/libraries/libui/default.nix+1−5
@@ -13,7 +13,7 @@ in
1313 sha256 = "1lpbfa298c61aarlzgp7vghrmxg1274pzxh1j9isv8x758gk6mfn";
1414 };
1515
16− nativeBuildInputs = [ pkgconfig ];
16+ nativeBuildInputs = [ pkgconfig ];
1717 buildInputs = [ cmake ] ++
1818 (if backend == "darwin" then [darwin.apple_sdk.frameworks.Cocoa]
1919 else if backend == "unix" then [gtk3]
@@ -22,10 +22,6 @@ in
2222 preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
2323 sed -i 's/set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8")//' ./CMakeLists.txt
2424 '';
25− cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [
26− "-DCMAKE_OSX_SYSROOT="
27− "-DCMAKE_OSX_DEPLOYMENT_TARGET="
28− ];
2925
3026 installPhase = ''
3127 mkdir -p $out/{include,lib}
pkgs/development/libraries/pcl/default.nix−1
@@ -29,7 +29,6 @@ stdenv.mkDerivation rec {
2929
3030 ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa AGL cf-private ];
3131 cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [
32− "-DCMAKE_OSX_SYSROOT=" "-DCMAKE_OSX_DEPLOYMENT_TARGET="
3332 "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks"
3433 ];
3534
pkgs/development/libraries/vtk/default.nix−2
@@ -41,8 +41,6 @@ stdenv.mkDerivation rec {
4141 cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" ]
4242 ++ optional (qtLib != null) [ "-DVTK_USE_QT:BOOL=ON" ]
4343 ++ optional stdenv.isDarwin [ "-DBUILD_TESTING:BOOL=OFF"
44− "-DCMAKE_OSX_SYSROOT="
45− "-DCMAKE_OSX_DEPLOYMENT_TARGET="
4644 "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ];
4745
4846 postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
pkgs/development/mobile/xpwn/default.nix−4
@@ -20,10 +20,6 @@ stdenv.mkDerivation {
2020
2121 buildInputs = [ cmake zlib libpng bzip2 libusb openssl ];
2222
23− cmakeFlags = [
24− "-DCMAKE_OSX_DEPLOYMENT_TARGET="
25− ];
26−
2723 meta = with stdenv.lib; {
2824 homepage = "http://planetbeing.lighthouseapp.com/projects/15246-xpwn";
2925 description = "Custom NOR firmware loader/IPSW generator for the iPhone";