Merge pull request #1252 from bjornfor/channel-rename-fix

unpack-channel.nix: fix 'mv' corner case
2017-02-27 13:12:35 +01:00
parent 89ffe1eff9 f72206b736
commit f0bbd153c6
1 changed files with 3 additions and 1 deletions
--- a/corepkgs/unpack-channel.nix
+++ b/corepkgs/unpack-channel.nix
@@ -15,7 +15,9 @@ let
      else
        ${bzip2} -d < $src | ${tar} xf - ${tarFlags}
      fi
-      mv * $out/$channelName
+      if [ * != $channelName ]; then
+        mv * $out/$channelName
+      fi
      if [ -n "$binaryCacheURL" ]; then
        mkdir $out/binary-caches
        echo -n "$binaryCacheURL" > $out/binary-caches/$channelName