public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #59755 from matthewbauer/patches-in-make-derivation

Browse Source 
make-derivation: put patches in all derivations
This commit is contained in:
Matthew Bauer 2019-04-23 18:33:04 -04:00 committed by GitHub
commit 7f23d9fc5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/stdenv/generic/make-derivation.nix
View File

@ -86,6 +86,8 @@ in rec {
, hardeningEnable ? [] , hardeningEnable ? []
, hardeningDisable ? [] , hardeningDisable ? []
, patches ? []
, ... } @ attrs: , ... } @ attrs:
let let
@ -235,6 +237,8 @@ in rec {
++ optional (elem "host" configurePlatforms) "--host=${stdenv.hostPlatform.config}" ++ optional (elem "host" configurePlatforms) "--host=${stdenv.hostPlatform.config}"
++ optional (elem "target" configurePlatforms) "--target=${stdenv.targetPlatform.config}"; ++ optional (elem "target" configurePlatforms) "--target=${stdenv.targetPlatform.config}";
inherit patches;
inherit doCheck doInstallCheck; inherit doCheck doInstallCheck;
inherit outputs; inherit outputs;