diff options
author | Ben Siraphob <bensiraphob@gmail.com> | 2020-12-31 14:48:55 +0700 |
---|---|---|
committer | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-01 11:52:33 +0700 |
commit | b04fc593e7b55fe1f74421b11589f12a339c92e2 (patch) | |
tree | fa9bbaeb68f1e0cfa6ea2f9580ea2892eed41b3e /pkgs/games | |
parent | 54ab07c1fe4e39c5a84834f85300c63e3809ac2d (diff) |
treewide: cmake buildInputs to nativeBuildInputs, minor cleanups
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/astromenace/default.nix | 3 | ||||
-rw-r--r-- | pkgs/games/blobby/default.nix | 22 | ||||
-rw-r--r-- | pkgs/games/cockatrice/default.nix | 4 | ||||
-rw-r--r-- | pkgs/games/holdingnuts/default.nix | 3 | ||||
-rw-r--r-- | pkgs/games/ja2-stracciatella/default.nix | 5 | ||||
-rw-r--r-- | pkgs/games/mars/default.nix | 16 | ||||
-rw-r--r-- | pkgs/games/megaglest/default.nix | 28 | ||||
-rw-r--r-- | pkgs/games/ninvaders/default.nix | 3 | ||||
-rw-r--r-- | pkgs/games/opendungeons/default.nix | 8 | ||||
-rw-r--r-- | pkgs/games/openlierox/default.nix | 5 | ||||
-rw-r--r-- | pkgs/games/openmw/default.nix | 14 | ||||
-rw-r--r-- | pkgs/games/privateer/default.nix | 7 | ||||
-rw-r--r-- | pkgs/games/rigsofrods/default.nix | 14 | ||||
-rw-r--r-- | pkgs/games/stuntrally/default.nix | 8 | ||||
-rw-r--r-- | pkgs/games/trackballs/default.nix | 13 | ||||
-rw-r--r-- | pkgs/games/xskat/default.nix | 34 |
16 files changed, 90 insertions, 97 deletions
diff --git a/pkgs/games/astromenace/default.nix b/pkgs/games/astromenace/default.nix index 7f1ca325746fb..1882f5a9b68dc 100644 --- a/pkgs/games/astromenace/default.nix +++ b/pkgs/games/astromenace/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1rkz6lwjcd5mwv72kf07ghvx6z46kf3xs250mjbmnmjpn7r5sxwv"; }; - buildInputs = [ cmake xlibsWrapper libGLU libGL SDL openal freealut libogg libvorbis ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ xlibsWrapper libGLU libGL SDL openal freealut libogg libvorbis ]; buildPhase = '' cmake ./ diff --git a/pkgs/games/blobby/default.nix b/pkgs/games/blobby/default.nix index ea8bddfa16d40..98c31f4e9fe85 100644 --- a/pkgs/games/blobby/default.nix +++ b/pkgs/games/blobby/default.nix @@ -1,24 +1,21 @@ -{stdenv, fetchurl, SDL2, SDL2_image, libGLU, libGL, cmake, physfs, boost, zip, zlib -, pkgconfig, unzip}: +{ stdenv, fetchurl, SDL2, SDL2_image, libGLU, libGL, cmake, physfs, boost, zip, zlib, pkg-config }: + stdenv.mkDerivation rec { - version = "1.0"; pname = "blobby-volley"; + version = "1.0"; src = fetchurl { url = "mirror://sourceforge/blobby/Blobby%20Volley%202%20%28Linux%29/1.0/blobby2-linux-1.0.tar.gz"; sha256 = "1qpmbdlyhfbrdsq4vkb6cb3b8mh27fpizb71q4a21ala56g08yms"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [SDL2 SDL2_image libGLU libGL cmake physfs boost zip zlib - unzip]; + nativeBuildInputs = [ cmake pkg-config zip ]; + buildInputs = [ SDL2 SDL2_image libGLU libGL physfs boost zlib ]; preConfigure='' sed -e '1i#include <iostream>' -i src/NetworkMessage.cpp ''; - inherit unzip; - postInstall = '' cp ../data/Icon.bmp "$out/share/blobby/" mv "$out/bin"/blobby{,.bin} @@ -26,13 +23,12 @@ stdenv.mkDerivation rec { chmod a+x "$out/bin/blobby" ''; - meta = { + meta = with stdenv.lib; { description = ''A blobby volleyball game''; - license = stdenv.lib.licenses.bsd3; - platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [raskin]; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ raskin ]; homepage = "http://blobby.sourceforge.net/"; downloadPage = "https://sourceforge.net/projects/blobby/files/Blobby%20Volley%202%20%28Linux%29/"; - inherit version; }; } diff --git a/pkgs/games/cockatrice/default.nix b/pkgs/games/cockatrice/default.nix index ac31de4e4c241..f8b90f87a723f 100644 --- a/pkgs/games/cockatrice/default.nix +++ b/pkgs/games/cockatrice/default.nix @@ -14,10 +14,10 @@ mkDerivation rec { }; buildInputs = [ - cmake qtbase qtmultimedia protobuf qttools qtwebsockets + qtbase qtmultimedia protobuf qttools qtwebsockets ]; - nativeBuildInputs = [ wrapQtAppsHook ]; + nativeBuildInputs = [ cmake wrapQtAppsHook ]; meta = { homepage = "https://github.com/Cockatrice/Cockatrice"; diff --git a/pkgs/games/holdingnuts/default.nix b/pkgs/games/holdingnuts/default.nix index d0cee8d76cfe4..39ee7af30f34b 100644 --- a/pkgs/games/holdingnuts/default.nix +++ b/pkgs/games/holdingnuts/default.nix @@ -25,7 +25,8 @@ in stdenv.mkDerivation rec { substituteInPlace src/system/SysAccess.c --replace /usr/share $out/share ''; - buildInputs = [ cmake SDL qt4 ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ SDL qt4 ]; meta = with stdenv.lib; { homepage = "http://www.holdingnuts.net/"; diff --git a/pkgs/games/ja2-stracciatella/default.nix b/pkgs/games/ja2-stracciatella/default.nix index 89d75dd837fae..4dfcc53d3397c 100644 --- a/pkgs/games/ja2-stracciatella/default.nix +++ b/pkgs/games/ja2-stracciatella/default.nix @@ -30,7 +30,8 @@ stdenv.mkDerivation { inherit src; inherit version; - buildInputs = [ cmake SDL2 fltk boost ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ SDL2 fltk boost ]; patches = [ ./remove-rust-buildstep.patch @@ -41,8 +42,6 @@ stdenv.mkDerivation { cmakeFlagsArray+=("-DEXTRA_DATA_DIR=$out/share/ja2") ''; - enableParallelBuilding = true; - meta = { description = "Jagged Alliance 2, with community fixes"; license = "SFI Source Code license agreement"; diff --git a/pkgs/games/mars/default.nix b/pkgs/games/mars/default.nix index 53ffb4e4b2d09..bab1279fb0503 100644 --- a/pkgs/games/mars/default.nix +++ b/pkgs/games/mars/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchgit, cmake, libGLU, libGL, sfml, fribidi, taglib }: +{ stdenv, fetchFromGitHub, cmake, libGLU, libGL, sfml, fribidi, taglib }: stdenv.mkDerivation rec { - name = "mars-${version}-${rev}"; + pname = "mars"; version = "0.7.5"; - rev = "c855d04409"; - src = fetchgit { - url = "https://github.com/thelaui/M.A.R.S..git"; - inherit rev; + + src = fetchFromGitHub { + owner = "thelaui"; + repo = "M.A.R.S."; + rev = "c855d044094a1d92317e38935d81ba938946132e"; sha256 = "1r4c5gap1z2zsv4yjd34qriqkxaq4lb4rykapyzkkdf4g36lc3nh"; }; - buildInputs = [ cmake libGLU libGL sfml fribidi taglib ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libGLU libGL sfml fribidi taglib ]; patches = [ ./unbind_fix.patch ./fix-gluortho2d.patch diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix index b7ab42ed7307e..0660d196f1eb8 100644 --- a/pkgs/games/megaglest/default.nix +++ b/pkgs/games/megaglest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, pkgconfig, git, curl, SDL2, xercesc, openal, lua, libvlc +{ stdenv, cmake, pkg-config, git, curl, SDL2, xercesc, openal, lua, libvlc , libjpeg, wxGTK, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng , fontconfig, freetype, xorg, makeWrapper, bash, which, gnome3, libGLU, glib , fetchFromGitHub @@ -28,17 +28,17 @@ stdenv.mkDerivation { sha256 = "0fb58a706nic14ss89zrigphvdiwy5s9dwvhscvvgrfvjpahpcws"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake git curl SDL2 xercesc openal lua libpng libjpeg libvlc wxGTK + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ git curl SDL2 xercesc openal lua libpng libjpeg libvlc wxGTK glib cppunit fontconfig freetype ftgl glew libogg libvorbis makeWrapper libGLU ]; - configurePhase = '' - cmake -DCMAKE_INSTALL_PREFIX=$out \ - -DBUILD_MEGAGLEST=On \ - -DBUILD_MEGAGLEST_MAP_EDITOR=On \ - -DBUILD_MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS=On \ - -DBUILD_MEGAGLEST_MODEL_VIEWER=On - ''; + cmakeFlags = [ + "-DCMAKE_INSTALL_PREFIX=$out" + "-DBUILD_MEGAGLEST=On" + "-DBUILD_MEGAGLEST_MAP_EDITOR=On" + "-DBUILD_MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS=On" + "-DBUILD_MEGAGLEST_MODEL_VIEWER=On" + ]; postInstall = '' for i in $out/bin/*; do @@ -48,11 +48,11 @@ stdenv.mkDerivation { done ''; - meta = { + meta = with stdenv.lib; { description = "An entertaining free (freeware and free software) and open source cross-platform 3D real-time strategy (RTS) game"; - license = stdenv.lib.licenses.gpl3; + license = licenses.gpl3; homepage = "http://megaglest.org/"; - maintainers = [ stdenv.lib.maintainers.matejc ]; - platforms = stdenv.lib.platforms.linux; + maintainers = [ maintainers.matejc ]; + platforms = platforms.linux; }; } diff --git a/pkgs/games/ninvaders/default.nix b/pkgs/games/ninvaders/default.nix index 26462c1eef5c8..7005ef8512f8d 100644 --- a/pkgs/games/ninvaders/default.nix +++ b/pkgs/games/ninvaders/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1wmwws1zsap4bfc2439p25vnja0hnsf57k293rdxw626gly06whi"; }; - buildInputs = [ cmake ncurses ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ ncurses ]; meta = with stdenv.lib; { description = "Space Invaders clone based on ncurses"; diff --git a/pkgs/games/opendungeons/default.nix b/pkgs/games/opendungeons/default.nix index 64b6c07f4a2a8..f0cb8120170f3 100644 --- a/pkgs/games/opendungeons/default.nix +++ b/pkgs/games/opendungeons/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ogre, cegui, boost, sfml, openal, cmake, ois, pkgconfig }: +{ stdenv, fetchFromGitHub, ogre, cegui, boost, sfml, openal, cmake, ois, pkg-config }: stdenv.mkDerivation rec { pname = "opendungeons"; @@ -13,14 +13,14 @@ stdenv.mkDerivation rec { patches = [ ./cmakepaths.patch ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake ogre cegui boost sfml openal ois ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ ogre cegui boost sfml openal ois ]; NIX_LDFLAGS = "-lpthread"; meta = with stdenv.lib; { description = "An open source, real time strategy game sharing game elements with the Dungeon Keeper series and Evil Genius"; homepage = "https://opendungeons.github.io"; - license = [ licenses.gpl3Plus licenses.zlib licenses.mit licenses.cc-by-sa-30 licenses.cc0 licenses.ofl licenses.cc-by-30 ]; + license = with licenses; [ gpl3Plus zlib mit cc-by-sa-30 cc0 ofl cc-by-30 ]; platforms = platforms.linux; }; } diff --git a/pkgs/games/openlierox/default.nix b/pkgs/games/openlierox/default.nix index 66c9420591d52..7bda06b8457a1 100644 --- a/pkgs/games/openlierox/default.nix +++ b/pkgs/games/openlierox/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libX11, xorgproto, gd, SDL, SDL_image, SDL_mixer, zlib -, libxml2, pkgconfig, curl, cmake, libzip }: +, libxml2, pkg-config, curl, cmake, libzip }: stdenv.mkDerivation { name = "openlierox-0.58rc3"; @@ -28,8 +28,9 @@ stdenv.mkDerivation { cp -R ../share/gamedir/* $out/share/OpenLieroX ''; + nativeBuildInputs = [ cmake pkg-config curl ]; buildInputs = [ libX11 xorgproto gd SDL SDL_image SDL_mixer zlib libxml2 - pkgconfig curl cmake libzip ]; + libzip ]; meta = { homepage = "http://openlierox.net"; diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index 22f3ea8d6ad38..663e0ecc157cb 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -1,5 +1,5 @@ -{ stdenv, mkDerivationWith, fetchFromGitHub, qtbase, openscenegraph, mygui, bullet, ffmpeg_3 -, boost, cmake, SDL2, unshield, openal, libXt, pkgconfig }: +{ stdenv, fetchFromGitHub, qtbase, openscenegraph, mygui, bullet, ffmpeg_3 +, boost, cmake, SDL2, unshield, openal, libXt, pkg-config }: let openscenegraph_ = openscenegraph.overrideDerivation (self: { @@ -10,7 +10,9 @@ let sha256 = "0d74hijzmj82nx3jkv5qmr3pkgvplra0b8fbjx1y3vmzxamb0axd"; }; }); -in mkDerivationWith stdenv.mkDerivation rec { +in + +stdenv.mkDerivation rec { version = "0.46.0"; pname = "openmw"; @@ -23,8 +25,8 @@ in mkDerivationWith stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake boost ffmpeg_3 bullet mygui openscenegraph_ SDL2 unshield openal libXt qtbase ]; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ boost ffmpeg_3 bullet mygui openscenegraph_ SDL2 unshield openal libXt qtbase ]; cmakeFlags = [ "-DDESIRED_QT_VERSION:INT=5" @@ -33,7 +35,7 @@ in mkDerivationWith stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An unofficial open source engine reimplementation of the game Morrowind"; homepage = "http://openmw.org"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/games/privateer/default.nix b/pkgs/games/privateer/default.nix index 16d0036b65835..9f555b88bcb25 100644 --- a/pkgs/games/privateer/default.nix +++ b/pkgs/games/privateer/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchsvn, boost, cmake, ffmpeg_3, freeglut, glib, gtk2, libjpeg, libpng, libpthreadstubs, libvorbis, libXau, libXdmcp, - libXmu, libGLU, libGL, openal, pixman, pkgconfig, python27, SDL }: + libXmu, libGLU, libGL, openal, pixman, pkg-config, python27, SDL }: stdenv.mkDerivation { name = "privateer-1.03"; @@ -12,10 +12,11 @@ stdenv.mkDerivation { sha256 = "e1759087d4565d3fc95e5c87d0f6ddf36b2cd5befec5695ec56ed5f3cd144c63"; }; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = - [ boost cmake ffmpeg_3 freeglut glib gtk2 libjpeg libpng + [ boost ffmpeg_3 freeglut glib gtk2 libjpeg libpng libpthreadstubs libvorbis libXau libXdmcp libXmu libGLU libGL openal - pixman pkgconfig python27 SDL ]; + pixman python27 SDL ]; patches = [ ./0001-fix-VSFile-constructor.patch ]; diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix index 9aa51bf344ee8..89743c3cf3e4a 100644 --- a/pkgs/games/rigsofrods/default.nix +++ b/pkgs/games/rigsofrods/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, stdenv, wxGTK30, freeimage, cmake, zziplib, libGLU, libGL, boost, - pkgconfig, libuuid, openal, ogre, ois, curl, gtk2, mygui, unzip, + pkg-config, libuuid, openal, ogre, ois, curl, gtk2, mygui, unzip, angelscript, ogrepaged, mysocketw, libxcb }: @@ -25,17 +25,17 @@ stdenv.mkDerivation rec { ln -s $out/share/rigsofrods/{RoR,RoRConfig} $out/bin ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ wxGTK30 freeimage cmake zziplib libGLU libGL boost + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ wxGTK30 freeimage zziplib libGLU libGL boost libuuid openal ogre ois curl gtk2 mygui unzip angelscript ogrepaged mysocketw libxcb ]; - meta = { + meta = with stdenv.lib; { description = "3D simulator game where you can drive, fly and sail various vehicles"; homepage = "http://rigsofrods.sourceforge.net/"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [raskin]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl3; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.linux; hydraPlatforms = []; }; } diff --git a/pkgs/games/stuntrally/default.nix b/pkgs/games/stuntrally/default.nix index 98a3ca883178e..5b8650029aa98 100644 --- a/pkgs/games/stuntrally/default.nix +++ b/pkgs/games/stuntrally/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, cmake, boost, ogre, mygui, ois, SDL2, libvorbis, pkgconfig +{ fetchurl, stdenv, cmake, boost, ogre, mygui, ois, SDL2, libvorbis, pkg-config , makeWrapper, enet, libXcursor, bullet, openal }: stdenv.mkDerivation rec { @@ -26,13 +26,11 @@ stdenv.mkDerivation rec { popd ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake boost ogre mygui ois SDL2 libvorbis + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ boost ogre mygui ois SDL2 libvorbis makeWrapper enet libXcursor bullet openal ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Stunt Rally game with Track Editor, based on VDrift and OGRE"; homepage = "http://stuntrally.tuxfamily.org/"; diff --git a/pkgs/games/trackballs/default.nix b/pkgs/games/trackballs/default.nix index 35c0b82877561..3eee4f17af11c 100644 --- a/pkgs/games/trackballs/default.nix +++ b/pkgs/games/trackballs/default.nix @@ -1,24 +1,23 @@ { stdenv, fetchFromGitHub, cmake, SDL2, SDL2_ttf, gettext, zlib, SDL2_mixer, SDL2_image, guile, libGLU, libGL }: -with stdenv.lib; - stdenv.mkDerivation rec { pname = "trackballs"; version = "1.3.2"; src = fetchFromGitHub { owner = "trackballs"; - repo = "trackballs"; + repo = pname; rev = "v${version}"; sha256 = "G+KfQgqk+iI+Beb/ZRul2ArCBcvwYQ/ftEWzdrtwb18="; }; - buildInputs = [ cmake zlib SDL2 SDL2_ttf SDL2_mixer SDL2_image guile gettext libGLU libGL ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ zlib SDL2 SDL2_ttf SDL2_mixer SDL2_image guile gettext libGLU libGL ]; - meta = { + meta = with stdenv.lib; { homepage = "https://trackballs.github.io/"; description = "3D Marble Madness clone"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; + platforms = platforms.linux; + license = licenses.gpl2; }; } diff --git a/pkgs/games/xskat/default.nix b/pkgs/games/xskat/default.nix index 5fa91a0395c14..5f0f867f1836a 100644 --- a/pkgs/games/xskat/default.nix +++ b/pkgs/games/xskat/default.nix @@ -1,37 +1,29 @@ {stdenv, fetchurl, libX11, imake, gccmakedep}: +stdenv.mkDerivation rec { + pname = "xskat"; + version = "4.0"; -let - s = # Generated upstream information - rec { - baseName="xskat"; - version="4.0"; - name="${baseName}-${version}"; + nativeBuildInputs = [ gccmakedep ]; + buildInputs = [ libX11 imake ]; - url="http://www.xskat.de/xskat-4.0.tar.gz"; - hash="8ba52797ccbd131dce69b96288f525b0d55dee5de4008733f7a5a51deb831c10"; - sha256="8ba52797ccbd131dce69b96288f525b0d55dee5de4008733f7a5a51deb831c10"; - }; - buildInputs = [ libX11 imake gccmakedep ]; -in - -stdenv.mkDerivation { - inherit (s) name version; - inherit buildInputs; src = fetchurl { - inherit (s) url sha256; + url = "http://www.xskat.de/xskat-${version }.tar.gz"; + sha256 = "8ba52797ccbd131dce69b96288f525b0d55dee5de4008733f7a5a51deb831c10"; }; + preInstall = '' sed -i Makefile \ -e "s|.* BINDIR .*| BINDIR = $out/bin|" \ -e "s|.* MANPATH .*| MANPATH = $out/man|" ''; + installTargets = [ "install" "install.man" ]; - meta = { - inherit (s) version; + + meta = with stdenv.lib; { description = ''Famous german card game''; - platforms = stdenv.lib.platforms.unix; - license = stdenv.lib.licenses.free; + platforms = platforms.unix; + license = licenses.free; longDescription = ''Play the german card game Skat against the AI or over IRC.''; homepage = "http://www.xskat.de/"; }; |