diff options
Diffstat (limited to 'pkgs/games/quake2')
-rw-r--r-- | pkgs/games/quake2/yquake2/default.nix | 4 | ||||
-rw-r--r-- | pkgs/games/quake2/yquake2/games.nix | 6 | ||||
-rw-r--r-- | pkgs/games/quake2/yquake2/wrapper.nix | 2 |
3 files changed, 4 insertions, 8 deletions
diff --git a/pkgs/games/quake2/yquake2/default.nix b/pkgs/games/quake2/yquake2/default.nix index 3af692d5bf9..57405d9abd3 100644 --- a/pkgs/games/quake2/yquake2/default.nix +++ b/pkgs/games/quake2/yquake2/default.nix @@ -24,8 +24,6 @@ let sha256 = "1dszbvxlh1npq4nv9s4wv4lcyfgb01k92ncxrrczsxy1dddg86pp"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake ]; buildInputs = [ SDL2 libGL curl ] @@ -57,7 +55,7 @@ let cp $src/stuff/yq2.cfg $out/share/games/quake2 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Yamagi Quake II client"; homepage = "https://www.yamagi.org/quake2/"; license = licenses.gpl2; diff --git a/pkgs/games/quake2/yquake2/games.nix b/pkgs/games/quake2/yquake2/games.nix index 98354a46d4a..0c9b24963ba 100644 --- a/pkgs/games/quake2/yquake2/games.nix +++ b/pkgs/games/quake2/yquake2/games.nix @@ -28,7 +28,7 @@ let inherit (data) id version description sha256; inherit title; - name = "yquake2-${title}-${version}"; + pname = "yquake2-${title}"; src = fetchFromGitHub { inherit sha256; @@ -37,8 +37,6 @@ let rev = "${lib.toUpper id}_${builtins.replaceStrings ["."] ["_"] version}"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake ]; installPhase = '' @@ -46,7 +44,7 @@ let cp Release/* $out/lib/yquake2/${id} ''; - meta = with stdenv.lib; { + meta = with lib; { inherit (data) description; homepage = "https://www.yamagi.org/quake2/"; license = licenses.unfree; diff --git a/pkgs/games/quake2/yquake2/wrapper.nix b/pkgs/games/quake2/yquake2/wrapper.nix index 9ab086f96a2..4850dff99dc 100644 --- a/pkgs/games/quake2/yquake2/wrapper.nix +++ b/pkgs/games/quake2/yquake2/wrapper.nix @@ -12,7 +12,7 @@ let }; in stdenv.mkDerivation { - name = "${name}-${stdenv.lib.getVersion yquake2}"; + name = "${name}-${lib.getVersion yquake2}"; nativeBuildInputs = [ makeWrapper ]; |