diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2019-11-24 17:22:28 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2019-11-24 17:22:28 +0000 |
| commit | 9b090ccbca3f7dd26d91db06e96e8bf8282c37ca (patch) | |
| tree | 1654f2f0cb883fa4cb95def306a933475d065431 /pkgs/development/em-modules | |
| parent | 99537e994f09e8e5499d3d877df0e16da8452ca7 (diff) | |
treewide: Get rid of most `parseDrvName` without breaking compat
That is because this commit should be merged to both master and
release-19.09.
Diffstat (limited to 'pkgs/development/em-modules')
| -rw-r--r-- | pkgs/development/em-modules/generic/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/em-modules/generic/default.nix b/pkgs/development/em-modules/generic/default.nix index d1e7ac882d79..a260beb51044 100644 --- a/pkgs/development/em-modules/generic/default.nix +++ b/pkgs/development/em-modules/generic/default.nix @@ -10,8 +10,8 @@ pkgs.stdenv.mkDerivation ( args // { - pname = "emscripten-${args.pname or (builtins.parseDrvName args.name).name}"; - version = args.version or (builtins.parseDrvName args.name).version; + pname = "emscripten-${lib.getName args}"; + version = lib.getVersion args; buildInputs = [ emscripten python ] ++ buildInputs; nativeBuildInputs = [ emscripten python ] ++ nativeBuildInputs; |