lix-project/lix
20
57
Fork 31
Code Issues 349 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Merge pull request #5783 from johnae/master

Browse source 
docker: fix image so that nix profile works
This commit is contained in:
Eelco Dolstra 2021-12-16 14:38:47 +01:00 committed by GitHub
parent 59a5f35802 6942ee8a84
commit 7caf9f33f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
docker.nix
View file

@ -137,11 +137,8 @@ let
name = "root-profile-env"; name = "root-profile-env";
paths = defaultPkgs; paths = defaultPkgs;
}; };
profile = pkgs.buildPackages.runCommand "user-environment" { } '' manifest = pkgs.buildPackages.runCommand "manifest.nix" { } ''
mkdir $out cat > $out <<EOF
cp -a ${rootEnv}/* $out/
cat > $out/manifest.nix <<EOF
[ [
${lib.concatStringsSep "\n" (builtins.map (drv: let ${lib.concatStringsSep "\n" (builtins.map (drv: let
outputs = drv.outputsToInstall or [ "out" ]; outputs = drv.outputsToInstall or [ "out" ];
@ -161,6 +158,11 @@ let
] ]
EOF EOF
''; '';
profile = pkgs.buildPackages.runCommand "user-environment" { } ''
mkdir $out
cp -a ${rootEnv}/* $out/
ln -s ${manifest} $out/manifest.nix
'';
in in
pkgs.runCommand "base-system" pkgs.runCommand "base-system"
{ {