about summary refs log tree commit diff
path: root/pkgs/build-support
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2008-06-17 07:53:09 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2008-06-17 07:53:09 +0000
commita3d259adf0524484fafb196666ea4e3f71fe3db8 (patch)
treee5d6180fe00c404e93684f5e88f62188369195fd /pkgs/build-support
parent0591ccedc0ef9115dda10446e6f4c72dbe62b56a (diff)
downloadnixlib-a3d259adf0524484fafb196666ea4e3f71fe3db8.tar
nixlib-a3d259adf0524484fafb196666ea4e3f71fe3db8.tar.gz
nixlib-a3d259adf0524484fafb196666ea4e3f71fe3db8.tar.bz2
nixlib-a3d259adf0524484fafb196666ea4e3f71fe3db8.tar.lz
nixlib-a3d259adf0524484fafb196666ea4e3f71fe3db8.tar.xz
nixlib-a3d259adf0524484fafb196666ea4e3f71fe3db8.tar.zst
nixlib-a3d259adf0524484fafb196666ea4e3f71fe3db8.zip
* Remove `~' from Debian package filenames (they're not allowed in the
  Nix store at top-level for portability reasons).  (NIX-106)

svn path=/nixpkgs/trunk/; revision=12133
Diffstat (limited to 'pkgs/build-support')
-rw-r--r--pkgs/build-support/vm/deb/deb-closure.pl6
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/build-support/vm/deb/deb-closure.pl b/pkgs/build-support/vm/deb/deb-closure.pl
index f35af6ca2dad..5e4ea54c43f8 100644
--- a/pkgs/build-support/vm/deb/deb-closure.pl
+++ b/pkgs/build-support/vm/deb/deb-closure.pl
@@ -1,6 +1,7 @@
 use strict;
 use Dpkg::Cdata;
 use Dpkg::Deps;
+use File::Basename;
 
 my $packagesFile = shift @ARGV;
 my $urlPrefix = shift @ARGV;
@@ -136,10 +137,15 @@ foreach my $pkgName (@order) {
 
     print "  [\n\n" if $newComponent;
     $newComponent = 0;
+
+    my $origName = basename $cdata->{Filename};
+    my $cleanedName = $origName;
+    $cleanedName =~ s/~//g;
     
     print "    (fetchurl {\n";
     print "      url = $urlPrefix/$cdata->{Filename};\n";
     print "      sha256 = \"$cdata->{SHA256}\";\n";
+    print "      name = \"$cleanedName\";\n" if $cleanedName ne $origName;
     print "    })\n";
     print "\n";