From 46420bbaa3f8f79ce7b9ee68e98eba1f7bce2db6 Mon Sep 17 00:00:00 2001 From: volth Date: Thu, 15 Aug 2019 12:41:18 +0000 Subject: treewide: name -> pname (easy cases) (#66585) treewide replacement of stdenv.mkDerivation rec { name = "*-${version}"; version = "*"; to pname --- pkgs/games/lincity/default.nix | 4 ++-- pkgs/games/lincity/ng.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/games/lincity') diff --git a/pkgs/games/lincity/default.nix b/pkgs/games/lincity/default.nix index 0abbfda33c7..fb98b1a3811 100644 --- a/pkgs/games/lincity/default.nix +++ b/pkgs/games/lincity/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, fetchpatch, libX11, libXext, xorgproto, libICE, libSM, libpng12, zlib }: stdenv.mkDerivation rec { - name = "lincity-${version}"; + pname = "lincity"; version = "1.13.1"; src = fetchurl { - url = "mirror://sourceforge/lincity/${name}.tar.gz"; + url = "mirror://sourceforge/lincity/${pname}-${version}.tar.gz"; sha256 = "0p81wl7labyfb6rgp0hi42l2akn3n7r2bnxal1wyvjylzw8vsk3v"; }; diff --git a/pkgs/games/lincity/ng.nix b/pkgs/games/lincity/ng.nix index b860d2ee58b..cfc06e11e19 100644 --- a/pkgs/games/lincity/ng.nix +++ b/pkgs/games/lincity/ng.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "lincity-ng-${version}"; + pname = "lincity-ng"; version = "2.9beta.20170715"; src = fetchFromGitHub { -- cgit 1.4.1