diff options
| -rw-r--r-- | pkgs/build-support/compress-drv/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/by-name/gi/gitea/package.nix | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/build-support/compress-drv/default.nix b/pkgs/build-support/compress-drv/default.nix index 47c76f4e100e..0773ab9e0554 100644 --- a/pkgs/build-support/compress-drv/default.nix +++ b/pkgs/build-support/compress-drv/default.nix @@ -1,8 +1,4 @@ -{ - lib, - xorg, - runCommand, -}: +{ lib, runCommand }: /** Compresses files of a given derivation, and returns a new derivation with compressed files @@ -72,7 +68,11 @@ let in runCommand "${drv.name}-compressed" { } '' mkdir $out - (cd $out; ${xorg.lndir}/bin/lndir ${drv}) + + # cannot use lndir here, because it also symlinks directories, + # which we do not need; we only need to symlink files. + (cd ${drv}; find -L -type d -exec mkdir -p $out/{} ';') + (cd ${drv}; find -L -type f -exec ln -s ${drv}/{} $out/{} ';') ${lib.concatStringsSep "\n\n" (lib.mapAttrsToList mkCmd compressors)} '' diff --git a/pkgs/by-name/gi/gitea/package.nix b/pkgs/by-name/gi/gitea/package.nix index 81625263a356..6c6bd91ad717 100644 --- a/pkgs/by-name/gi/gitea/package.nix +++ b/pkgs/by-name/gi/gitea/package.nix @@ -88,7 +88,7 @@ in buildGoModule rec { ''; passthru = { - data-compressed = lib.warn "gitea.passthru.data-compressed is deprecated. Use \"compressDrvWeb gitea.data\"." (compressDrvWeb gitea.data); + data-compressed = lib.warn "gitea.passthru.data-compressed is deprecated. Use \"compressDrvWeb gitea.data\"." (compressDrvWeb gitea.data {}); tests = nixosTests.gitea; }; |