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.

pkgs/build-support/fetchzip/default.nix

@@ -13,9 +13,7 @@
 , ... } @ args:
 
 fetchurl ({
-  # Remove the extension, because otherwise unpackPhase will get
+  name = args.name or (baseNameOf url);
-  # confused. FIXME: fix unpackPhase.
-  name = args.name or lib.removeSuffix ".zip" (lib.removeSuffix ".tar.gz" (baseNameOf url));
 
   recursiveHash = true;
 

pkgs/stdenv/generic/setup.sh

@@ -475,6 +475,13 @@ unpackFile() {
 
     header "unpacking source archive $curSrc" 3
 
+    if [ -d "$curSrc" ]; then
+
+        stripHash $curSrc
+        cp -prd --no-preserve=timestamps $curSrc $strippedName
+
+    else
+
         case "$curSrc" in
             *.tar.xz | *.tar.lzma)
                 # Don't rely on tar knowing about .xz.
@@ -489,19 +496,16 @@ unpackFile() {
                 unzip -qq $curSrc
                 ;;
             *)
-            if [ -d "$curSrc" ]; then
-                stripHash $curSrc
-                cp -prd --no-preserve=timestamps $curSrc $strippedName
-            else
                 if [ -z "$unpackCmd" ]; then
                     echo "source archive $curSrc has unknown type"
                     exit 1
                 fi
                 runSingleHook unpackCmd
-            fi
                 ;;
         esac
 
+    fi
+
     stopNest
 }