lincity: use mkDerivation

+13 -18
+12 -17
pkgs/games/lincity/default.nix
··· 1 - args @ { libX11, libXext, xextproto, libICE, libSM, xproto, libpng, zlib, ... }: with args; 2 - let 3 - version = lib.attrByPath ["version"] "1.12.1" args; 4 - sha256 = lib.attrByPath ["sha256"] 5 - "0xmrp7vkkp1hfblb6nl3rh2651qsbcm21bnncpnma1sf40jaf8wj" args; 6 - pkgName = "lincity"; 7 - in 8 - rec { 9 src = fetchurl { 10 - url = "mirror://sourceforge/lincity/${pkgName}-${version}.tar.gz"; 11 - inherit sha256; 12 }; 13 14 - buildInputs = [libICE libpng libSM libX11 libXext 15 - xextproto zlib xproto]; 16 - configureFlags = []; 17 - 18 - /* doConfigure should be specified separately */ 19 - phaseNames = ["doConfigure" "doMakeInstall"]; 20 21 - name = "${pkgName}-" + version; 22 meta = { 23 description = "City simulation game"; 24 };
··· 1 + { stdenv, fetchurl, libX11, libXext, xextproto, libICE, libSM, xproto, libpng, zlib }: 2 + 3 + stdenv.mkDerivation rec { 4 + name = "lincity-${version}"; 5 + version = "1.12.1"; 6 + 7 src = fetchurl { 8 + url = "mirror://sourceforge/lincity/${name}.tar.gz"; 9 + sha256 = "0xmrp7vkkp1hfblb6nl3rh2651qsbcm21bnncpnma1sf40jaf8wj"; 10 }; 11 12 + buildInputs = [ 13 + libICE libpng libSM libX11 libXext 14 + xextproto zlib xproto 15 + ]; 16 17 meta = { 18 description = "City simulation game"; 19 };
+1 -1
pkgs/top-level/all-packages.nix
··· 14241 14242 lgogdownloader = callPackage ../games/lgogdownloader { }; 14243 14244 - lincity = builderDefsPackage (callPackage ../games/lincity) {}; 14245 14246 lincity_ng = callPackage ../games/lincity/ng.nix {}; 14247
··· 14241 14242 lgogdownloader = callPackage ../games/lgogdownloader { }; 14243 14244 + lincity = callPackage ../games/lincity {}; 14245 14246 lincity_ng = callPackage ../games/lincity/ng.nix {}; 14247