Merge pull request #335670 from motiejus/gitea.passthru.data-compressed

gitea: fix passthru.data-compressed

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)}
 ''

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;
   };