diff options
| author | John Ericson <git@JohnEricson.me> | 2019-11-24 13:31:35 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-24 13:31:35 -0500 |
| commit | 1206faa6d5c9dc9aecb811091e1d547599ecd195 (patch) | |
| tree | 4a05df171e8adff6fc6eba84b95db9d14438eaa4 /pkgs/top-level | |
| parent | a52d7674cc7bdf5fbccf1d273fadc58f008c839e (diff) | |
| parent | 747d5a3dbf1758ae4ef8037429337c029a9e76d0 (diff) | |
| download | nixpkgs-1206faa6d5c9dc9aecb811091e1d547599ecd195.tar nixpkgs-1206faa6d5c9dc9aecb811091e1d547599ecd195.tar.gz nixpkgs-1206faa6d5c9dc9aecb811091e1d547599ecd195.tar.bz2 nixpkgs-1206faa6d5c9dc9aecb811091e1d547599ecd195.tar.lz nixpkgs-1206faa6d5c9dc9aecb811091e1d547599ecd195.tar.xz nixpkgs-1206faa6d5c9dc9aecb811091e1d547599ecd195.tar.zst nixpkgs-1206faa6d5c9dc9aecb811091e1d547599ecd195.zip | |
Merge pull request #74057 from Ericson2314/wrapper-pname-support
treewide: Purge most parseDrvName
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/lua-packages.nix | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 020e71e63d1..ec45bd272e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18862,8 +18862,7 @@ in firefox-bin = wrapFirefox firefox-bin-unwrapped { browserName = "firefox"; - name = "firefox-bin-" + - (builtins.parseDrvName firefox-bin-unwrapped.name).version; + pname = "firefox-bin"; desktopName = "Firefox"; }; @@ -18876,8 +18875,7 @@ in firefox-beta-bin = res.wrapFirefox firefox-beta-bin-unwrapped { browserName = "firefox"; - name = "firefox-beta-bin-" + - (builtins.parseDrvName firefox-beta-bin-unwrapped.name).version; + pname = "firefox-beta-bin"; desktopName = "Firefox Beta"; }; @@ -18891,8 +18889,7 @@ in firefox-devedition-bin = res.wrapFirefox firefox-devedition-bin-unwrapped { browserName = "firefox"; nameSuffix = "-devedition"; - name = "firefox-devedition-bin-" + - (builtins.parseDrvName firefox-devedition-bin-unwrapped.name).version; + pname = "firefox-devedition-bin"; desktopName = "Firefox DevEdition"; }; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index e01534f2891..7f29d47a993 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -23,7 +23,7 @@ let isLua51 = (lib.versions.majorMinor lua.version) == "5.1"; isLua52 = (lib.versions.majorMinor lua.version) == "5.2"; isLua53 = lua.luaversion == "5.3"; - isLuaJIT = (builtins.parseDrvName lua.name).name == "luajit"; + isLuaJIT = lib.getName lua == "luajit"; lua-setup-hook = callPackage ../development/interpreters/lua-5/setup-hook.nix { }; |