unpackFile: Always copy directories

If $src refers to a directory, then always copy it. Previously, we
checked the extension first, so if the directory had an extension like
.tar, unpackPhase would fail.
This commit is contained in:
Eelco Dolstra
2014-08-09 12:44:49 +02:00
parent 5e82aab5d4
commit 1a44dbbbb9
2 changed files with 26 additions and 24 deletions
+1 -3
View File
@@ -13,9 +13,7 @@
, ... } @ args:
fetchurl ({
# Remove the extension, because otherwise unpackPhase will get
# confused. FIXME: fix unpackPhase.
name = args.name or lib.removeSuffix ".zip" (lib.removeSuffix ".tar.gz" (baseNameOf url));
name = args.name or (baseNameOf url);
recursiveHash = true;