cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

cmake: Only apply application-services.patch with 3.11

Browse source 
The patch doesn't apply with earlier versions. Fixes #41816.
This commit is contained in:
Ben Gamari 2018-06-10 21:30:23 -04:00
parent 41cdec2e51
commit 5962d0d5f3
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" ];