diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-23 18:33:04 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-23 18:33:04 -0400 |
| commit | 7f23d9fc5f2191b661fc8eb793a378747353bbb0 (patch) | |
| tree | 1ae899f03587f2b468744634e22718a1c061e306 /pkgs/stdenv | |
| parent | c93fd4a25e36c7a18991d624596c72afa68edd85 (diff) | |
| parent | c7ccb9f197789e424a70a878b9f967ddf38d39c6 (diff) | |
| download | nixpkgs-7f23d9fc5f2191b661fc8eb793a378747353bbb0.tar nixpkgs-7f23d9fc5f2191b661fc8eb793a378747353bbb0.tar.gz nixpkgs-7f23d9fc5f2191b661fc8eb793a378747353bbb0.tar.bz2 nixpkgs-7f23d9fc5f2191b661fc8eb793a378747353bbb0.tar.lz nixpkgs-7f23d9fc5f2191b661fc8eb793a378747353bbb0.tar.xz nixpkgs-7f23d9fc5f2191b661fc8eb793a378747353bbb0.tar.zst nixpkgs-7f23d9fc5f2191b661fc8eb793a378747353bbb0.zip | |
Merge pull request #59755 from matthewbauer/patches-in-make-derivation
make-derivation: put patches in all derivations
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 34d48e8cf33..1c6f6490bf7 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -86,6 +86,8 @@ in rec { , hardeningEnable ? [] , hardeningDisable ? [] + , patches ? [] + , ... } @ attrs: let @@ -235,6 +237,8 @@ in rec { ++ optional (elem "host" configurePlatforms) "--host=${stdenv.hostPlatform.config}" ++ optional (elem "target" configurePlatforms) "--target=${stdenv.targetPlatform.config}"; + inherit patches; + inherit doCheck doInstallCheck; inherit outputs; |