From a3d259adf0524484fafb196666ea4e3f71fe3db8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 17 Jun 2008 07:53:09 +0000 Subject: [PATCH] * 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 --- pkgs/build-support/vm/deb/deb-closure.pl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/build-support/vm/deb/deb-closure.pl b/pkgs/build-support/vm/deb/deb-closure.pl index f35af6ca2da..5e4ea54c43f 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";