diff options
author | volth <volth@volth.com> | 2019-08-13 21:52:01 +0000 |
---|---|---|
committer | volth <volth@volth.com> | 2019-08-28 11:07:32 +0000 |
commit | 08f68313a47a2093dc0f408a706b2c125bc59c95 (patch) | |
tree | bb48188c0bf9fac152c038426146df518ef8c562 /pkgs/games | |
parent | 5061fe0c2c7743370e1d379d6fa60eed26ff1470 (diff) |
treewide: remove redundant rec
Diffstat (limited to 'pkgs/games')
61 files changed, 79 insertions, 79 deletions
diff --git a/pkgs/games/90secondportraits/default.nix b/pkgs/games/90secondportraits/default.nix index f2be128fd998..0b0cea703662 100644 --- a/pkgs/games/90secondportraits/default.nix +++ b/pkgs/games/90secondportraits/default.nix @@ -21,7 +21,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { diff --git a/pkgs/games/alienarena/default.nix b/pkgs/games/alienarena/default.nix index 628a521126f5..89c74d83b490 100644 --- a/pkgs/games/alienarena/default.nix +++ b/pkgs/games/alienarena/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, libjpeg, libX11, libXxf86vm, curl, libogg , libvorbis, freetype, openal, libGLU_combined }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "alienarena-7.65"; src = fetchurl { diff --git a/pkgs/games/andyetitmoves/default.nix b/pkgs/games/andyetitmoves/default.nix index d4ff86c424b1..943f9eb881c5 100644 --- a/pkgs/games/andyetitmoves/default.nix +++ b/pkgs/games/andyetitmoves/default.nix @@ -4,7 +4,7 @@ let plainName = "andyetitmoves"; version = "1.2.2"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${plainName}-${version}"; src = if stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux" diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix index 5b1f240e7b5f..c224784e8f24 100644 --- a/pkgs/games/arx-libertatis/default.nix +++ b/pkgs/games/arx-libertatis/default.nix @@ -9,7 +9,7 @@ with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "arx-libertatis"; version = "2019-02-16"; diff --git a/pkgs/games/blackshades/default.nix b/pkgs/games/blackshades/default.nix index bf58b523e76e..a35b449f92fd 100644 --- a/pkgs/games/blackshades/default.nix +++ b/pkgs/games/blackshades/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchsvn, SDL, libGLU_combined, openal, libvorbis, freealut, SDL_image}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "blackshades-svn-110"; src = fetchsvn { url = svn://svn.icculus.org/blackshades/trunk; diff --git a/pkgs/games/cuyo/default.nix b/pkgs/games/cuyo/default.nix index f4e5290df27b..24e45719f516 100644 --- a/pkgs/games/cuyo/default.nix +++ b/pkgs/games/cuyo/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, SDL, SDL_mixer, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "cuyo"; version = "2.1.0"; diff --git a/pkgs/games/devilutionx/default.nix b/pkgs/games/devilutionx/default.nix index 52d3bdd5b79f..117ebcc1ac18 100644 --- a/pkgs/games/devilutionx/default.nix +++ b/pkgs/games/devilutionx/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, SDL2, SDL2_mixer, SDL2_ttf, libsodium, pkg-config }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "unstable-2019-07-28"; pname = "devilutionx"; diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index 0b25af645cfa..71024f3d5c91 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -83,7 +83,7 @@ let fi ''; - dfhack = stdenv.mkDerivation rec { + dfhack = stdenv.mkDerivation { pname = "dfhack-base"; inherit version; diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix index e3005373b95f..6871a611784c 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix @@ -7,7 +7,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "dwarf-therapist-${dwarf-therapist.version}"; wrapper = ./dwarf-therapist.in; diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix index 06bc6ca1fe51..31b21c5a4351 100644 --- a/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -80,7 +80,7 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "dwarf-fortress-${dwarf-fortress.dfVersion}"; dfInit = substituteAll { diff --git a/pkgs/games/dxx-rebirth/full.nix b/pkgs/games/dxx-rebirth/full.nix index 020a4593de24..7a1e690c39df 100644 --- a/pkgs/games/dxx-rebirth/full.nix +++ b/pkgs/games/dxx-rebirth/full.nix @@ -2,7 +2,7 @@ , dxx-rebirth, descent1-assets, descent2-assets }: let - generic = ver: assets: stdenv.mkDerivation rec { + generic = ver: assets: stdenv.mkDerivation { name = "d${toString ver}x-rebirth-full-${assets.version}"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/games/empty-epsilon/default.nix b/pkgs/games/empty-epsilon/default.nix index 18c83b8c5a4c..cee9be00a3ab 100644 --- a/pkgs/games/empty-epsilon/default.nix +++ b/pkgs/games/empty-epsilon/default.nix @@ -8,7 +8,7 @@ let version = "${major}.${minor}.${patch}"; - serious-proton = stdenv.mkDerivation rec { + serious-proton = stdenv.mkDerivation { pname = "serious-proton"; inherit version; @@ -34,7 +34,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "empty-epsilon"; inherit version; diff --git a/pkgs/games/endless-sky/default.nix b/pkgs/games/endless-sky/default.nix index a138b46f81bd..14bea8185c6f 100644 --- a/pkgs/games/endless-sky/default.nix +++ b/pkgs/games/endless-sky/default.nix @@ -6,7 +6,7 @@ let version = "0.9.8"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "endless-sky"; inherit version; diff --git a/pkgs/games/freedroidrpg/default.nix b/pkgs/games/freedroidrpg/default.nix index b269a5d12d6d..281691d283d7 100644 --- a/pkgs/games/freedroidrpg/default.nix +++ b/pkgs/games/freedroidrpg/default.nix @@ -2,7 +2,7 @@ let version = "0.16.1"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "freedroidrpg"; inherit version; diff --git a/pkgs/games/frogatto/data.nix b/pkgs/games/frogatto/data.nix index ec2cb9416661..6531d407d219 100644 --- a/pkgs/games/frogatto/data.nix +++ b/pkgs/games/frogatto/data.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "frogatto-data"; version = "unstable-2018-12-18"; diff --git a/pkgs/games/frogatto/default.nix b/pkgs/games/frogatto/default.nix index 51975c17a8ee..4c5f1af8a9be 100644 --- a/pkgs/games/frogatto/default.nix +++ b/pkgs/games/frogatto/default.nix @@ -15,7 +15,7 @@ let categories = "Application;Game;ArcadeGame;"; }; version = "unstable-2018-12-18"; -in buildEnv rec { +in buildEnv { name = "frogatto-${version}"; buildInputs = [ makeWrapper ]; diff --git a/pkgs/games/frogatto/engine.nix b/pkgs/games/frogatto/engine.nix index 5a01d2512c42..5254ff25b025 100644 --- a/pkgs/games/frogatto/engine.nix +++ b/pkgs/games/frogatto/engine.nix @@ -2,7 +2,7 @@ , boost, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf , glew, zlib, icu, pkgconfig, cairo, libvpx }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "anura-engine"; version = "unstable-2018-11-28"; diff --git a/pkgs/games/gambatte/default.nix b/pkgs/games/gambatte/default.nix index de4a89eac07f..6d8d14d8de0d 100644 --- a/pkgs/games/gambatte/default.nix +++ b/pkgs/games/gambatte/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, scons, qt4 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gambatte"; version = "2016-05-03"; diff --git a/pkgs/games/gnome-hexgl/default.nix b/pkgs/games/gnome-hexgl/default.nix index 7a720239182d..340dd20aaafe 100644 --- a/pkgs/games/gnome-hexgl/default.nix +++ b/pkgs/games/gnome-hexgl/default.nix @@ -9,7 +9,7 @@ , gtk3 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "gnome-hexgl"; version = "unstable-2019-08-21"; diff --git a/pkgs/games/gnuchess/default.nix b/pkgs/games/gnuchess/default.nix index 62c5ee803047..43c60c667305 100644 --- a/pkgs/games/gnuchess/default.nix +++ b/pkgs/games/gnuchess/default.nix @@ -12,7 +12,7 @@ let flex ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { inherit (s) name version; src = fetchurl { inherit (s) url sha256; diff --git a/pkgs/games/gscrabble/default.nix b/pkgs/games/gscrabble/default.nix index fc73f89f66c0..f9dd851af8e9 100644 --- a/pkgs/games/gscrabble/default.nix +++ b/pkgs/games/gscrabble/default.nix @@ -2,7 +2,7 @@ , gtk3, wrapGAppsHook, gst_all_1, gobject-introspection , python3Packages, gnome3, hicolor-icon-theme }: -buildPythonApplication rec { +buildPythonApplication { pname = "gscrabble"; version = "unstable-2019-03-11"; diff --git a/pkgs/games/hawkthorne/default.nix b/pkgs/games/hawkthorne/default.nix index 97aee425fd16..a770e452ae4c 100644 --- a/pkgs/games/hawkthorne/default.nix +++ b/pkgs/games/hawkthorne/default.nix @@ -1,6 +1,6 @@ { fetchgit, stdenv, love, curl, zip }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "0.12.1"; pname = "hawkthorne"; diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index 7ef5c6a49b3e..b3764ea1efc8 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -9,7 +9,7 @@ let SHA entropy pkgs.zlib sandi regex-tdfa ]); in -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "1.0.0-beta1"; pname = "hedgewars"; src = fetchhg { diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix index b0acd789afee..b25341da01d8 100644 --- a/pkgs/games/instead/default.nix +++ b/pkgs/games/instead/default.nix @@ -28,7 +28,7 @@ let ]; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "instead-" + version; src = fetchurl { diff --git a/pkgs/games/ja2-stracciatella/default.nix b/pkgs/games/ja2-stracciatella/default.nix index 94c614598bfe..fa0720e51fd9 100644 --- a/pkgs/games/ja2-stracciatella/default.nix +++ b/pkgs/games/ja2-stracciatella/default.nix @@ -26,7 +26,7 @@ let doCheck = false; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ja2-stracciatella"; inherit src; inherit version; diff --git a/pkgs/games/liberal-crime-squad/default.nix b/pkgs/games/liberal-crime-squad/default.nix index 0e819278dc39..0811c01aa791 100644 --- a/pkgs/games/liberal-crime-squad/default.nix +++ b/pkgs/games/liberal-crime-squad/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, stdenv, autoreconfHook, libiconv, ncurses, SDL2, SDL2_mixer }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "2016-07-06"; pname = "liberal-crime-squad"; diff --git a/pkgs/games/lincity/ng.nix b/pkgs/games/lincity/ng.nix index cfc06e11e191..3ec508040e7a 100644 --- a/pkgs/games/lincity/ng.nix +++ b/pkgs/games/lincity/ng.nix @@ -3,7 +3,7 @@ , SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, physfs }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "lincity-ng"; version = "2.9beta.20170715"; diff --git a/pkgs/games/linux-steam-integration/default.nix b/pkgs/games/linux-steam-integration/default.nix index f57571b2a2c4..a3c9599e7b1d 100644 --- a/pkgs/games/linux-steam-integration/default.nix +++ b/pkgs/games/linux-steam-integration/default.nix @@ -4,7 +4,7 @@ let version = "0.7.3"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "linux-steam-integration"; inherit version; diff --git a/pkgs/games/meritous/default.nix b/pkgs/games/meritous/default.nix index 8b0808d8e8cc..4a37fc8f6767 100644 --- a/pkgs/games/meritous/default.nix +++ b/pkgs/games/meritous/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitLab, SDL, SDL_image, SDL_mixer, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "meritous"; version = "1.4"; diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix index 9ddae8b65bf3..2fde729e935e 100644 --- a/pkgs/games/minecraft-server/default.nix +++ b/pkgs/games/minecraft-server/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, jre }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "minecraft-server"; version = "1.14.4"; diff --git a/pkgs/games/mrrescue/default.nix b/pkgs/games/mrrescue/default.nix index aa4a06bc7d2b..c75fbbb1ca92 100644 --- a/pkgs/games/mrrescue/default.nix +++ b/pkgs/games/mrrescue/default.nix @@ -21,7 +21,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { diff --git a/pkgs/games/newtonwars/default.nix b/pkgs/games/newtonwars/default.nix index c465b413db12..a0ae03cefb75 100644 --- a/pkgs/games/newtonwars/default.nix +++ b/pkgs/games/newtonwars/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, makeWrapper, freeglut, libGLU_combined }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "newtonwars"; version = "20150609"; diff --git a/pkgs/games/njam/default.nix b/pkgs/games/njam/default.nix index bcbbc9e7756b..6f700ad32045 100644 --- a/pkgs/games/njam/default.nix +++ b/pkgs/games/njam/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, SDL, SDL_image, SDL_mixer, SDL_net }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "njam-1.25"; src = fetchurl { diff --git a/pkgs/games/odamex/default.nix b/pkgs/games/odamex/default.nix index c70744ea2991..6c6bb9f78bab 100644 --- a/pkgs/games/odamex/default.nix +++ b/pkgs/games/odamex/default.nix @@ -1,6 +1,6 @@ { stdenv, cmake, fetchurl, pkgconfig, SDL, SDL_mixer, SDL_net }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "odamex-0.7.0"; |