summary refs log tree commit diff
path: root/pkgs/build-support/buildenv
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2010-08-09 16:08:02 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2010-08-09 16:08:02 +0000
commite875ec25245337bb647ed76988d625986cb1ee71 (patch)
treee633c27ecdedbaf4416d2de794b65ad4e8e98e33 /pkgs/build-support/buildenv
parentbe3d5d34960322c3267de8f074c769e5446daf3a (diff)
downloadnixpkgs-e875ec25245337bb647ed76988d625986cb1ee71.tar
nixpkgs-e875ec25245337bb647ed76988d625986cb1ee71.tar.gz
nixpkgs-e875ec25245337bb647ed76988d625986cb1ee71.tar.bz2
nixpkgs-e875ec25245337bb647ed76988d625986cb1ee71.tar.lz
nixpkgs-e875ec25245337bb647ed76988d625986cb1ee71.tar.xz
nixpkgs-e875ec25245337bb647ed76988d625986cb1ee71.tar.zst
nixpkgs-e875ec25245337bb647ed76988d625986cb1ee71.zip
* Make sure that if pathsToLink contains an element such as
  "/share/info" that it doesn't match "/share/information.nix".

svn path=/nixpkgs/trunk/; revision=23059
Diffstat (limited to 'pkgs/build-support/buildenv')
-rwxr-xr-xpkgs/build-support/buildenv/builder.pl5
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl
index a181d72ab83..cdd65cbc523 100755
--- a/pkgs/build-support/buildenv/builder.pl
+++ b/pkgs/build-support/buildenv/builder.pl
@@ -17,7 +17,10 @@ sub isInPathsToLink {
     my $path = shift;
     $path = "/" if $path eq "";
     foreach my $elem (@pathsToLink) {
-        return 1 if substr($path, 0, length($elem)) eq $elem;
+        return 1 if
+            $elem eq "/" || 
+            (substr($path, 0, length($elem)) eq $elem
+             && (($path eq $elem) || (substr($path, length($elem), 1) eq "/")));
     }
     return 0;
 }