diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-11-04 20:15:05 -0600 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-11-05 13:30:42 -0600 |
| commit | 21eeb00a08d53df3e55f98d0fd09ef3ba9db73af (patch) | |
| tree | d47b007ab2f380ee2d8452d2ca2ca026700790ef | |
| parent | d94d220b849e6df2eb9e22bd2ccf84109387592a (diff) | |
| download | nixpkgs-21eeb00a08d53df3e55f98d0fd09ef3ba9db73af.tar nixpkgs-21eeb00a08d53df3e55f98d0fd09ef3ba9db73af.tar.gz nixpkgs-21eeb00a08d53df3e55f98d0fd09ef3ba9db73af.tar.bz2 nixpkgs-21eeb00a08d53df3e55f98d0fd09ef3ba9db73af.tar.lz nixpkgs-21eeb00a08d53df3e55f98d0fd09ef3ba9db73af.tar.xz nixpkgs-21eeb00a08d53df3e55f98d0fd09ef3ba9db73af.tar.zst nixpkgs-21eeb00a08d53df3e55f98d0fd09ef3ba9db73af.zip | |
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)
| -rw-r--r-- | pkgs/development/libraries/libui/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/pcl/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/libraries/vtk/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/mobile/xpwn/default.nix | 4 |
4 files changed, 1 insertions, 12 deletions
diff --git a/pkgs/development/libraries/libui/default.nix b/pkgs/development/libraries/libui/default.nix index 9eb2fe04fe6..150e299ac42 100644 --- a/pkgs/development/libraries/libui/default.nix +++ b/pkgs/development/libraries/libui/default.nix @@ -13,7 +13,7 @@ in sha256 = "1lpbfa298c61aarlzgp7vghrmxg1274pzxh1j9isv8x758gk6mfn"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake ] ++ (if backend == "darwin" then [darwin.apple_sdk.frameworks.Cocoa] else if backend == "unix" then [gtk3] @@ -22,10 +22,6 @@ in preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' sed -i 's/set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8")//' ./CMakeLists.txt ''; - cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [ - "-DCMAKE_OSX_SYSROOT=" - "-DCMAKE_OSX_DEPLOYMENT_TARGET=" - ]; installPhase = '' mkdir -p $out/{include,lib} diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index 9fb2e0b7fed..14eff45e4a1 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa AGL cf-private ]; cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [ - "-DCMAKE_OSX_SYSROOT=" "-DCMAKE_OSX_DEPLOYMENT_TARGET=" "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ]; diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index b85d76640cf..afd29aeb006 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -41,8 +41,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" ] ++ optional (qtLib != null) [ "-DVTK_USE_QT:BOOL=ON" ] ++ optional stdenv.isDarwin [ "-DBUILD_TESTING:BOOL=OFF" - "-DCMAKE_OSX_SYSROOT=" - "-DCMAKE_OSX_DEPLOYMENT_TARGET=" "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ]; postPatch = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/mobile/xpwn/default.nix b/pkgs/development/mobile/xpwn/default.nix index d5ffb7f6c01..d62902e4f6e 100644 --- a/pkgs/development/mobile/xpwn/default.nix +++ b/pkgs/development/mobile/xpwn/default.nix @@ -20,10 +20,6 @@ stdenv.mkDerivation { buildInputs = [ cmake zlib libpng bzip2 libusb openssl ]; - cmakeFlags = [ - "-DCMAKE_OSX_DEPLOYMENT_TARGET=" - ]; - meta = with stdenv.lib; { homepage = "http://planetbeing.lighthouseapp.com/projects/15246-xpwn"; description = "Custom NOR firmware loader/IPSW generator for the iPhone"; |