mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Code Issues Wiki Activity

Merge pull request #41817 from bgamari/T41816

Browse source 
cmake: Only apply application-services.patch with 3.11
This commit is contained in:
Matthew Justin Bauer 2018-06-10 22:02:25 -04:00 committed by GitHub
parent e7b304e60b 5962d0d5f3
commit 51aec3b2ad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/tools/build-managers/cmake/default.nix
View file

@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
# Don't search in non-Nix locations such as /usr, but do search in our libc.
patches = [ ./search-path-3.9.patch ]
# Don't depend on frameworks.
++ optional useSharedLibraries ./application-services.patch # TODO: remove conditional
++ optional (useSharedLibraries && majorVersion == "3.11") ./application-services.patch # TODO: remove conditional
++ optional stdenv.isCygwin ./3.2.2-cygwin.patch;
outputs = [ "out" ];