Browse Source

release.nix: Unchroot recursively.

* release.nix (unchroot): Operate recursively on build inputs.
gn-latest-20200428
Ludovic Courtès 8 years ago
parent
commit
c86929e403
1 changed files with 17 additions and 4 deletions
  1. +17
    -4
      release.nix

+ 17
- 4
release.nix View File

@ -30,10 +30,23 @@ let
# hydra.gnu.org where we want Guix derivations to run in a chroot that lacks
# /bin, whereas Nixpkgs relies on /bin/sh.
unchroot =
let pkgs = import nixpkgs {}; in
drv: pkgs.lib.overrideDerivation drv (args: {
__noChroot = true;
});
let
pkgs = import nixpkgs {};
# XXX: The `python' derivation contains a `modules' attribute that makes
# `overrideDerivation' fail with "cannot coerce an attribute set (except
# a derivation) to a string", so just remove it.
pythonKludge = drv: removeAttrs drv [ "modules" ];
in
drv:
if builtins.isAttrs drv
then pkgs.lib.overrideDerivation (pythonKludge drv) (args: {
__noChroot = true;
buildNativeInputs = map unchroot args.buildNativeInputs;
propagatedBuildNativeInputs =
map unchroot args.propagatedBuildNativeInputs;
})
else drv;
# The Guile used to bootstrap the whole thing. It's normally
# downloaded by the build system, but here we download it via a


Loading…
Cancel
Save