diff options
author | volth <volth@volth.com> | 2019-08-15 12:41:18 +0000 |
---|---|---|
committer | Jörg Thalheim <Mic92@users.noreply.github.com> | 2019-08-15 13:41:18 +0100 |
commit | 46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6 (patch) | |
tree | 46b871987347acf0215f8a9bf54df275aed9c496 /pkgs/games/quakespasm | |
parent | cff9e6429a4341e924594f5e057b03ca8101b314 (diff) | |
download | nixpkgs-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar nixpkgs-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar.gz nixpkgs-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar.bz2 nixpkgs-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar.lz nixpkgs-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar.xz nixpkgs-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.tar.zst nixpkgs-46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6.zip |
treewide: name -> pname (easy cases) (#66585)
treewide replacement of stdenv.mkDerivation rec { name = "*-${version}"; version = "*"; to pname
Diffstat (limited to 'pkgs/games/quakespasm')
-rw-r--r-- | pkgs/games/quakespasm/default.nix | 4 | ||||
-rw-r--r-- | pkgs/games/quakespasm/vulkan.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/games/quakespasm/default.nix b/pkgs/games/quakespasm/default.nix index f61b0e23792..a8d740ea512 100644 --- a/pkgs/games/quakespasm/default.nix +++ b/pkgs/games/quakespasm/default.nix @@ -1,6 +1,6 @@ { stdenv, SDL, fetchurl, gzip, libvorbis, libmad }: stdenv.mkDerivation rec { - name = "quakespasm-${version}"; + pname = "quakespasm"; majorVersion = "0.93"; version = "${majorVersion}.1"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1bimv18f6rzhyjz78yvw2vqr5n0kdqbcqmq7cb3m951xgsxfcgpd"; }; - sourceRoot = "${name}/Quake"; + sourceRoot = "${pname}-${version}/Quake"; buildInputs = [ gzip SDL libvorbis libmad diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix index 4cd073869dc..114f862888d 100644 --- a/pkgs/games/quakespasm/vulkan.nix +++ b/pkgs/games/quakespasm/vulkan.nix @@ -1,7 +1,7 @@ { stdenv, SDL2, fetchFromGitHub, makeWrapper, gzip, libvorbis, libmad, vulkan-headers, vulkan-loader }: stdenv.mkDerivation rec { - name = "vkquake-${version}"; + pname = "vkquake"; majorVersion = "1.01"; version = "${majorVersion}.0"; |