Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

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)

+1 -12
+1 -5
pkgs/development/libraries/libui/default.nix
··· 13 13 sha256 = "1lpbfa298c61aarlzgp7vghrmxg1274pzxh1j9isv8x758gk6mfn"; 14 14 }; 15 15 16 - nativeBuildInputs = [ pkgconfig ]; 16 + nativeBuildInputs = [ pkgconfig ]; 17 17 buildInputs = [ cmake ] ++ 18 18 (if backend == "darwin" then [darwin.apple_sdk.frameworks.Cocoa] 19 19 else if backend == "unix" then [gtk3] ··· 22 22 preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' 23 23 sed -i 's/set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8")//' ./CMakeLists.txt 24 24 ''; 25 - cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [ 26 - "-DCMAKE_OSX_SYSROOT=" 27 - "-DCMAKE_OSX_DEPLOYMENT_TARGET=" 28 - ]; 29 25 30 26 installPhase = '' 31 27 mkdir -p $out/{include,lib}
-1
pkgs/development/libraries/pcl/default.nix
··· 29 29 30 30 ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa AGL cf-private ]; 31 31 cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [ 32 - "-DCMAKE_OSX_SYSROOT=" "-DCMAKE_OSX_DEPLOYMENT_TARGET=" 33 32 "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" 34 33 ]; 35 34
-2
pkgs/development/libraries/vtk/default.nix
··· 41 41 cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" ] 42 42 ++ optional (qtLib != null) [ "-DVTK_USE_QT:BOOL=ON" ] 43 43 ++ optional stdenv.isDarwin [ "-DBUILD_TESTING:BOOL=OFF" 44 - "-DCMAKE_OSX_SYSROOT=" 45 - "-DCMAKE_OSX_DEPLOYMENT_TARGET=" 46 44 "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ]; 47 45 48 46 postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
-4
pkgs/development/mobile/xpwn/default.nix
··· 20 20 21 21 buildInputs = [ cmake zlib libpng bzip2 libusb openssl ]; 22 22 23 - cmakeFlags = [ 24 - "-DCMAKE_OSX_DEPLOYMENT_TARGET=" 25 - ]; 26 - 27 23 meta = with stdenv.lib; { 28 24 homepage = "http://planetbeing.lighthouseapp.com/projects/15246-xpwn"; 29 25 description = "Custom NOR firmware loader/IPSW generator for the iPhone";