diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2008-05-15 17:51:41 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2008-05-15 17:51:41 +0000 |
| commit | 09ab1882a9fc3186536147552ec89f8af61f3c45 (patch) | |
| tree | 61a85ceebdd6dd107252a63bc45aa8f7ceb20b61 /pkgs/top-level/builder-defs.nix | |
| parent | 5b98b7ac77f470f2f5e9723fed61bd3cebd1a76c (diff) | |
| download | nixlib-09ab1882a9fc3186536147552ec89f8af61f3c45.tar nixlib-09ab1882a9fc3186536147552ec89f8af61f3c45.tar.gz nixlib-09ab1882a9fc3186536147552ec89f8af61f3c45.tar.bz2 nixlib-09ab1882a9fc3186536147552ec89f8af61f3c45.tar.lz nixlib-09ab1882a9fc3186536147552ec89f8af61f3c45.tar.xz nixlib-09ab1882a9fc3186536147552ec89f8af61f3c45.tar.zst nixlib-09ab1882a9fc3186536147552ec89f8af61f3c45.zip | |
top-level changes ..
svn path=/nixpkgs/trunk/; revision=11829
Diffstat (limited to 'pkgs/top-level/builder-defs.nix')
| -rw-r--r-- | pkgs/top-level/builder-defs.nix | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/top-level/builder-defs.nix b/pkgs/top-level/builder-defs.nix index ee7aafbdd25a..7773b3da6d7f 100644 --- a/pkgs/top-level/builder-defs.nix +++ b/pkgs/top-level/builder-defs.nix @@ -17,6 +17,9 @@ args: with args; with stringsWithDeps; with lib; else if (hasSuffixHack "-cvs-export" s) then "cvs-dir" else if (hasSuffixHack ".nar.bz2" s) then "narbz2" + # Mostly for manually specified directories.. + else if (hasSuffixHack "/" s) then "dir" + # Last block - for single files!! It should be always after .tar.* else if (hasSuffixHack ".bz2" s) then "plain-bz2" @@ -195,6 +198,10 @@ args: with args; with stringsWithDeps; with lib; cp -r '${s}' . cd \$(basename ${s}) chmod u+rwX -R . + " else if (archiveType s) == "dir" then " + cp -r '${s}' . + cd \$(basename ${s}) + chmod u+rwX -R . " else if (archiveType s) == "narbz2" then " bzip2 <${s} | nix-store --restore \$PWD/\$(basename ${s} .nar.bz2) cd \$(basename ${s} .nar.bz2) |