diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-11-01 08:07:15 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-11-01 08:07:15 +0100 |
| commit | c4be15a83b95b882357990488a7c8ccd47feb94b (patch) | |
| tree | a78697741d7accef6276b91ac4e12f80311d9456 /pkgs/build-support/closure-info.nix | |
| parent | 732057238787f1ed5769d7946525834b7999b269 (diff) | |
| download | nixpkgs-c4be15a83b95b882357990488a7c8ccd47feb94b.tar nixpkgs-c4be15a83b95b882357990488a7c8ccd47feb94b.tar.gz nixpkgs-c4be15a83b95b882357990488a7c8ccd47feb94b.tar.bz2 nixpkgs-c4be15a83b95b882357990488a7c8ccd47feb94b.tar.lz nixpkgs-c4be15a83b95b882357990488a7c8ccd47feb94b.tar.xz nixpkgs-c4be15a83b95b882357990488a7c8ccd47feb94b.tar.zst nixpkgs-c4be15a83b95b882357990488a7c8ccd47feb94b.zip | |
closure-info: another half-blind attempt to fix on Hydra
The previous one was very bad and worsened the situation. But even running with some nix-1.12 I'm unable to reproduce the original failure. Let's unblock channels for now.
Diffstat (limited to 'pkgs/build-support/closure-info.nix')
| -rw-r--r-- | pkgs/build-support/closure-info.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/build-support/closure-info.nix b/pkgs/build-support/closure-info.nix index 537cc1fbb75..4d178ac96c5 100644 --- a/pkgs/build-support/closure-info.nix +++ b/pkgs/build-support/closure-info.nix @@ -8,7 +8,10 @@ { rootPaths }: -if builtins.langVersion >= 5 then +#if builtins.langVersion >= 5 then +# FIXME: it doesn't work on Hydra, failing to find mkdir; +# perhaps .attrs.sh clobbers PATH with new nix? +if false then # Nix >= 1.12: Include NAR hash / size info. @@ -19,7 +22,7 @@ if builtins.langVersion >= 5 then exportReferencesGraph.closure = rootPaths; - nativeBuildInputs = [ jq ]; + PATH = "${coreutils}/bin:${jq}/bin"; builder = builtins.toFile "builder" '' |