diff options
author | William A. Kennington III <william@wkennington.com> | 2015-03-27 16:03:03 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-03-27 16:03:03 -0700 |
commit | 7ccccc15bac279dc780c6b59885e63b9b21edddd (patch) | |
tree | 8b3805fb9edb944492309ec2bc395e24fb0164d9 /pkgs/build-support | |
parent | 9fc53d95bca760918b85250129596434ab35255c (diff) | |
parent | c612a25666013c1abcbe338f8f2af14dea278f75 (diff) | |
download | nixlib-7ccccc15bac279dc780c6b59885e63b9b21edddd.tar nixlib-7ccccc15bac279dc780c6b59885e63b9b21edddd.tar.gz nixlib-7ccccc15bac279dc780c6b59885e63b9b21edddd.tar.bz2 nixlib-7ccccc15bac279dc780c6b59885e63b9b21edddd.tar.lz nixlib-7ccccc15bac279dc780c6b59885e63b9b21edddd.tar.xz nixlib-7ccccc15bac279dc780c6b59885e63b9b21edddd.tar.zst nixlib-7ccccc15bac279dc780c6b59885e63b9b21edddd.zip |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/builder-defs/builder-defs.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/build-support/builder-defs/builder-defs.nix b/pkgs/build-support/builder-defs/builder-defs.nix index da5d22498523..42d8f35b076d 100644 --- a/pkgs/build-support/builder-defs/builder-defs.nix +++ b/pkgs/build-support/builder-defs/builder-defs.nix @@ -23,6 +23,7 @@ let inherit (builtins) head tail trace; in 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 ".rar" s then "rar" else if (hasSuffixHack ".zip" s) || (hasSuffixHack ".ZIP" s) then "zip" else if hasSuffixHack "-cvs-export" s then "cvs-dir" else if hasSuffixHack "-git-export" s then "git-dir" @@ -213,6 +214,9 @@ let inherit (builtins) head tail trace; in " 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) == "rar" then " + unrar x '${s}' + cd \"$(unrar lb '${s}' | tail -1 | sed -e 's@/.*@@' )\" " else if (archiveType s) == "zip" then " unzip '${s}' cd \"$( unzip -lqq '${s}' | tail -1 | |