public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xorg: adjust generator to work with other archive types 

In the end I didn't utilize it, but it shouldn't hurt.
This commit is contained in:
Vladimír Čunát 2015-10-19 10:08:16 +02:00
parent b6059b2c6a
commit 2755d2b241
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
View File

@ -61,7 +61,7 @@ while (<>) {
#next unless $pkg eq "xcbutil"; #next unless $pkg eq "xcbutil";
} }
$tarball =~ /\/([^\/]*)\.tar\.bz2$/; $tarball =~ /\/([^\/]*)\.tar\.(bz2|gz|xz)$/;
my $pkgName = $1; my $pkgName = $1;
print " $pkg $pkgName\n"; print " $pkg $pkgName\n";
@ -82,7 +82,7 @@ while (<>) {
print "\nunpacking $path\n"; print "\nunpacking $path\n";
system "rm -rf '$tmpDir'"; system "rm -rf '$tmpDir'";
mkdir $tmpDir, 0700; mkdir $tmpDir, 0700;
system "cd '$tmpDir' && tar xfj '$path'"; system "cd '$tmpDir' && tar xf '$path'";
die "cannot unpack `$path'" if $? != 0; die "cannot unpack `$path'" if $? != 0;
print "\n"; print "\n";