From e4abf8610be3d9f3023a538460f87be8f31bca2d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 7 Oct 2015 14:47:39 +0200
Subject: [PATCH] nix-prefetch-url -A: Use "name" attribute from Nix expression
This is in particular useful for fetchFromGitHub et al., ensuring that
the store path produced by nix-prefetch-url corresponds to what those
functions expect.
---
src/nix-prefetch-url/nix-prefetch-url.cc | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/nix-prefetch-url/nix-prefetch-url.cc b/src/nix-prefetch-url/nix-prefetch-url.cc
index 5da8d968b..a3932d6be 100644
--- a/src/nix-prefetch-url/nix-prefetch-url.cc
+++ b/src/nix-prefetch-url/nix-prefetch-url.cc
@@ -54,6 +54,7 @@ int main(int argc, char * * argv)
string attrPath;
std::map<string, string> autoArgs_;
bool unpack = false;
+ string name;
parseCmdLine(argc, argv, [&](Strings::iterator & arg, const Strings::iterator & end) {
if (*arg == "--help")
@@ -122,10 +123,16 @@ int main(int argc, char * * argv)
printMsg(lvlInfo, "warning: this does not look like a fetchurl call");
else
unpack = state.forceString(*attr->value) == "recursive";
+
+ /* Extract the name. */
+ attr = v.attrs->find(state.symbols.create("name"));
+ if (attr != v.attrs->end())
+ name = state.forceString(*attr->value);
}
/* Figure out a name in the Nix store. */
- auto name = baseNameOf(uri);
+ if (name.empty())
+ name = baseNameOf(uri);
if (name.empty())
throw Error(format("cannot figure out file name for ‘%1%’") % uri);
--
GitLab