From f237bad7b0884439cf0f5baa7dc25de03c6cbd51 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 17 Oct 2009 05:26:52 +0000 Subject: [PATCH] Add xz support to builderDefs svn path=/nixpkgs/trunk/; revision=17855 --- pkgs/build-support/builder-defs/builder-defs.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/build-support/builder-defs/builder-defs.nix b/pkgs/build-support/builder-defs/builder-defs.nix index cab7ead227f..814ce460794 100644 --- a/pkgs/build-support/builder-defs/builder-defs.nix +++ b/pkgs/build-support/builder-defs/builder-defs.nix @@ -22,6 +22,7 @@ let inherit (builtins) head tail trace; in (hasSuffixHack ".tbz" s) then "tbz2" else if (hasSuffixHack ".tar.Z" s) then "tZ" else if (hasSuffixHack ".tar.lzma" s) then "tar.lzma" + else if (hasSuffixHack ".tar.xz" s) then "tar.xz" else if (hasSuffixHack ".zip" s) || (hasSuffixHack ".ZIP" s) then "zip" else if (hasSuffixHack "-cvs-export" s) then "cvs-dir" else if (hasSuffixHack ".nar.bz2" s) then "narbz2" @@ -212,6 +213,9 @@ let inherit (builtins) head tail trace; in " else if (archiveType s) == "tar.lzma" then " unlzma -d -c <'${s}' | tar xv cd \"\$(unlzma -d -c <'${s}' | tar t | head -1 | sed -e 's@/.*@@' )\" + " else if (archiveType s) == "tar.xz" then " + xz -d -c <'${s}' | tar xv + cd \"\$(xz -d -c <'${s}' | tar t | head -1 | sed -e 's@/.*@@' )\" " else if (archiveType s) == "zip" then " unzip '${s}' cd \"$( unzip -lqq '${s}' | tail -1 |