about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2015-10-19 10:08:16 +0200
committerVladimír Čunát <vcunat@gmail.com>2015-10-19 10:08:16 +0200
commit2755d2b241077f5a3f68db128c699d00c91d8452 (patch)
treef092efb3c748f5f41d82fe40a9431b94531013c2
parentb6059b2c6a4fbecbdadbe67aa4ac424e112ba4f9 (diff)
downloadnixlib-2755d2b241077f5a3f68db128c699d00c91d8452.tar
nixlib-2755d2b241077f5a3f68db128c699d00c91d8452.tar.gz
nixlib-2755d2b241077f5a3f68db128c699d00c91d8452.tar.bz2
nixlib-2755d2b241077f5a3f68db128c699d00c91d8452.tar.lz
nixlib-2755d2b241077f5a3f68db128c699d00c91d8452.tar.xz
nixlib-2755d2b241077f5a3f68db128c699d00c91d8452.tar.zst
nixlib-2755d2b241077f5a3f68db128c699d00c91d8452.zip
xorg: adjust generator to work with other archive types
In the end I didn't utilize it, but it shouldn't hurt.
-rwxr-xr-xpkgs/servers/x11/xorg/generate-expr-from-tarballs.pl4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 1e0ce6d6167e..6665a3bc00a9 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -61,7 +61,7 @@ while (<>) {
       #next unless $pkg eq "xcbutil";
     }
 
-    $tarball =~ /\/([^\/]*)\.tar\.bz2$/;
+    $tarball =~ /\/([^\/]*)\.tar\.(bz2|gz|xz)$/;
     my $pkgName = $1;
 
     print "  $pkg $pkgName\n";
@@ -82,7 +82,7 @@ while (<>) {
     print "\nunpacking $path\n";
     system "rm -rf '$tmpDir'";
     mkdir $tmpDir, 0700;
-    system "cd '$tmpDir' && tar xfj '$path'";
+    system "cd '$tmpDir' && tar xf '$path'";
     die "cannot unpack `$path'" if $? != 0;
     print "\n";