summary refs log tree commit diff
diff options
context:
space:
mode:
authorChristopher League <league@contrapunctus.net>2023-07-09 15:47:31 -0400
committerChristopher League <league@contrapunctus.net>2023-07-09 22:06:26 -0400
commitef2d657a01ccb6d217d3d1699586046825628ebf (patch)
treecbc5c90838b4297a3d4e750ceb83fae53a8faee4
parent2b356dae6208d422236c4cdc48f3bed749f9daea (diff)
downloadnixpkgs-ef2d657a01ccb6d217d3d1699586046825628ebf.tar
nixpkgs-ef2d657a01ccb6d217d3d1699586046825628ebf.tar.gz
nixpkgs-ef2d657a01ccb6d217d3d1699586046825628ebf.tar.bz2
nixpkgs-ef2d657a01ccb6d217d3d1699586046825628ebf.tar.lz
nixpkgs-ef2d657a01ccb6d217d3d1699586046825628ebf.tar.xz
nixpkgs-ef2d657a01ccb6d217d3d1699586046825628ebf.tar.zst
nixpkgs-ef2d657a01ccb6d217d3d1699586046825628ebf.zip
buildenv: Limit exclusion of info/dir
While trying to exclude a generated `/share/info/dir` in a package
from symlinking into a profile, we also ended up excluding the Emacs
info manual for `dired-x`.  This change excludes only the dir file.
-rwxr-xr-xpkgs/build-support/buildenv/builder.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl
index ebd6026b259..975e76df05c 100755
--- a/pkgs/build-support/buildenv/builder.pl
+++ b/pkgs/build-support/buildenv/builder.pl
@@ -126,7 +126,7 @@ sub findFiles {
     return if
         $relName eq "/propagated-build-inputs" ||
         $relName eq "/nix-support" ||
-        $relName =~ /info\/dir/ ||
+        $relName =~ /info\/dir$/ ||
         ( $relName =~ /^\/share\/mime\// && !( $relName =~ /^\/share\/mime\/packages/ ) ) ||
         $baseName eq "perllocal.pod" ||
         $baseName eq "log" ||