diff options
author | Robert Hensing <roberth@users.noreply.github.com> | 2021-12-03 00:20:44 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-03 00:20:44 +0100 |
commit | 66c19d856bb4eece4dce7f35787126dd67274acd (patch) | |
tree | 1af5cef5b3c00ab766d2e00e9ba4407c4820c3f6 /pkgs/build-support/docker/default.nix | |
parent | f55e8bf2c4211218086528ba175c76ab91631824 (diff) | |
parent | d0bcc212de13b1cd876bb8f01c90a8e8f42e25b6 (diff) | |
download | nixpkgs-66c19d856bb4eece4dce7f35787126dd67274acd.tar nixpkgs-66c19d856bb4eece4dce7f35787126dd67274acd.tar.gz nixpkgs-66c19d856bb4eece4dce7f35787126dd67274acd.tar.bz2 nixpkgs-66c19d856bb4eece4dce7f35787126dd67274acd.tar.lz nixpkgs-66c19d856bb4eece4dce7f35787126dd67274acd.tar.xz nixpkgs-66c19d856bb4eece4dce7f35787126dd67274acd.tar.zst nixpkgs-66c19d856bb4eece4dce7f35787126dd67274acd.zip |
Merge pull request #148341 from hercules-ci/add-dockerTools-customization-layer-dependencies
dockerTools: Add store dependencies of the customization layer
Diffstat (limited to 'pkgs/build-support/docker/default.nix')
-rw-r--r-- | pkgs/build-support/docker/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index dcfa5ec593d..7958db91712 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -867,13 +867,13 @@ rec { }; closureRoots = lib.optionals includeStorePaths /* normally true */ ( - [ baseJson ] ++ contentsList + [ baseJson customisationLayer ] ); overallClosure = writeText "closure" (lib.concatStringsSep " " closureRoots); # These derivations are only created as implementation details of docker-tools, # so they'll be excluded from the created images. - unnecessaryDrvs = [ baseJson overallClosure ]; + unnecessaryDrvs = [ baseJson overallClosure customisationLayer ]; conf = runCommand "${baseName}-conf.json" { |