diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-26 16:18:53 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-26 16:18:53 +0200 |
| commit | f59e6f4037a741d41bee04e9b1ee684aae956d86 (patch) | |
| tree | 7a4d525b632c96a333c4deb4550b77e518cdc1f9 /pkgs/stdenv/generic | |
| parent | 38ac3b34373f1eb75ce85edca60f22ee6a2bcd85 (diff) | |
| parent | 812f4749ae76262490e5e3984f8676953da1f5dc (diff) | |
| download | nixlib-f59e6f4037a741d41bee04e9b1ee684aae956d86.tar nixlib-f59e6f4037a741d41bee04e9b1ee684aae956d86.tar.gz nixlib-f59e6f4037a741d41bee04e9b1ee684aae956d86.tar.bz2 nixlib-f59e6f4037a741d41bee04e9b1ee684aae956d86.tar.lz nixlib-f59e6f4037a741d41bee04e9b1ee684aae956d86.tar.xz nixlib-f59e6f4037a741d41bee04e9b1ee684aae956d86.tar.zst nixlib-f59e6f4037a741d41bee04e9b1ee684aae956d86.zip | |
Merge master into staging
Diffstat (limited to 'pkgs/stdenv/generic')
| -rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 45b83ce50d13..48ee68f4c00c 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -164,7 +164,7 @@ rec { derivationArg = (removeAttrs attrs - ["meta" "passthru" "crossAttrs" "pos" + ["meta" "passthru" "pos" "doCheck" "doInstallCheck" "checkInputs" "installCheckInputs" "__impureHostDeps" "__propagatedImpureHostDeps" |