From 1daa883f8c673f8e2a96aa68a4deb8efc4a1f557 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 17 Jun 2010 05:19:26 +0000 Subject: [PATCH] Support renamed downloads for autoupdatable packages svn path=/nixpkgs/trunk/; revision=22303 --- pkgs/build-support/builder-defs/builder-defs.nix | 5 +++-- 1 file 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;