nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-03 12:23:02 +00:00
Code Issues Packages Projects Releases 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
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" ];