aboutsummaryrefslogtreecommitdiff
path: root/pkgs/development/em-modules
diff options
context:
space:
mode:
authorvolth <volth@volth.com>2019-08-15 12:41:18 +0000
committerJörg Thalheim <Mic92@users.noreply.github.com>2019-08-15 13:41:18 +0100
commit46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6 (patch)
tree46b871987347acf0215f8a9bf54df275aed9c496 /pkgs/development/em-modules
parentcff9e6429a4341e924594f5e057b03ca8101b314 (diff)
treewide: name -> pname (easy cases) (#66585)
treewide replacement of stdenv.mkDerivation rec { name = "*-${version}"; version = "*"; to pname
Diffstat (limited to 'pkgs/development/em-modules')
-rw-r--r--pkgs/development/em-modules/generic/default.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/em-modules/generic/default.nix b/pkgs/development/em-modules/generic/default.nix
index f03e6e42739a..d1e7ac882d79 100644
--- a/pkgs/development/em-modules/generic/default.nix
+++ b/pkgs/development/em-modules/generic/default.nix
@@ -7,10 +7,11 @@
, meta ? {}, ... } @ args:
pkgs.stdenv.mkDerivation (
- args //
+ args //
{
- name = "emscripten-${args.name}";
+ pname = "emscripten-${args.pname or (builtins.parseDrvName args.name).name}";
+ version = args.version or (builtins.parseDrvName args.name).version;
buildInputs = [ emscripten python ] ++ buildInputs;
nativeBuildInputs = [ emscripten python ] ++ nativeBuildInputs;