summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorMichael Raskin2010-06-17 05:19:26 +0000
committerMichael Raskin2010-06-17 05:19:26 +0000
commit1daa883f8c673f8e2a96aa68a4deb8efc4a1f557 (patch)
tree9dfc8ccc31231fc9558a2b0cf5523bbf3beb164b /pkgs
parentc6b5662b780a90560c862de8c06d0f5df637439a (diff)
Support renamed downloads for autoupdatable packages
svn path=/nixpkgs/trunk/; revision=22303
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/build-support/builder-defs/builder-defs.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/build-support/builder-defs/builder-defs.nix b/pkgs/build-support/builder-defs/builder-defs.nix
index bca7fd716597..3ef0c862964b 100644
--- a/pkgs/build-support/builder-defs/builder-defs.nix
+++ b/pkgs/build-support/builder-defs/builder-defs.nix
@@ -541,10 +541,11 @@ let inherit (builtins) head tail trace; in
      export PYTHONPATH=$PYTHONPATH''${PYTHONPATH:+:}$(toPythonPath $out)
    '') ["minInit" "addInputs" "defEnsureDir"];
 
-   fetchUrlFromSrcInfo = srcInfo: fetchurl {
+   fetchUrlFromSrcInfo = srcInfo: fetchurl ({
      url = srcInfo.url;
      sha256 = srcInfo.hash;
-   };
+   } // 
+   (if (srcInfo ? downloadName) then {name = srcInfo.downloadName;} else {}));
 
    fetchGitFromSrcInfo = srcInfo: fetchgit {
      url = srcInfo.url;