diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-02-20 12:16:56 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-02-20 12:16:56 +0100 |
commit | b24d64b3b1ef897f07cd072a88a9881cb330aa7f (patch) | |
tree | a87bb2eed9af3ef1efd51dd65221d91f0c949041 /nixpkgs/pkgs/games | |
parent | 73338df7473bb3810e70a16b8b0cba4f0f606f2b (diff) | |
parent | fa15b53dbea5028db38d6e09b4cef6eba42aeebb (diff) | |
download | nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.gz nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.bz2 nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.lz nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.xz nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.tar.zst nixlib-b24d64b3b1ef897f07cd072a88a9881cb330aa7f.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/games')
-rw-r--r-- | nixpkgs/pkgs/games/endless-sky/default.nix | 4 | ||||
-rw-r--r-- | nixpkgs/pkgs/games/factorio/versions.json | 48 | ||||
-rw-r--r-- | nixpkgs/pkgs/games/freeciv/default.nix | 4 | ||||
-rw-r--r-- | nixpkgs/pkgs/games/heroic/default.nix | 6 | ||||
-rw-r--r-- | nixpkgs/pkgs/games/minesweep-rs/default.nix | 6 | ||||
-rw-r--r-- | nixpkgs/pkgs/games/openmw/tes3mp.nix | 21 | ||||
-rw-r--r-- | nixpkgs/pkgs/games/openrct2/default.nix | 4 | ||||
-rwxr-xr-x | nixpkgs/pkgs/games/osu-lazer/update-bin.sh | 2 | ||||
-rwxr-xr-x | nixpkgs/pkgs/games/osu-lazer/update.sh | 2 | ||||
-rw-r--r-- | nixpkgs/pkgs/games/pysolfc/default.nix | 12 | ||||
-rw-r--r-- | nixpkgs/pkgs/games/speed-dreams/default.nix | 30 | ||||
-rw-r--r-- | nixpkgs/pkgs/games/starsector/default.nix | 4 | ||||
-rw-r--r-- | nixpkgs/pkgs/games/stone-kingdoms/default.nix | 4 | ||||
-rw-r--r-- | nixpkgs/pkgs/games/torcs/default.nix | 5 | ||||
-rw-r--r-- | nixpkgs/pkgs/games/trigger/default.nix | 18 |
15 files changed, 112 insertions, 58 deletions
diff --git a/nixpkgs/pkgs/games/endless-sky/default.nix b/nixpkgs/pkgs/games/endless-sky/default.nix index 9a3e86117cef..ffb71f393ca2 100644 --- a/nixpkgs/pkgs/games/endless-sky/default.nix +++ b/nixpkgs/pkgs/games/endless-sky/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "endless-sky"; - version = "0.10.4"; + version = "0.10.6"; src = fetchFromGitHub { owner = "endless-sky"; repo = "endless-sky"; rev = "v${version}"; - sha256 = "sha256-VTg8H6umq9yMMP274StIJfEZZvUFDILiMKhioam58QE="; + sha256 = "sha256-3mprmW6K8pYs7J2q71fohsh9fZEP2RZjN1rSWUAwbhg="; }; patches = [ diff --git a/nixpkgs/pkgs/games/factorio/versions.json b/nixpkgs/pkgs/games/factorio/versions.json index 9e5f6d3e6533..a627e967d199 100644 --- a/nixpkgs/pkgs/games/factorio/versions.json +++ b/nixpkgs/pkgs/games/factorio/versions.json @@ -2,56 +2,56 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.101.tar.xz", + "name": "factorio_alpha_x64-1.1.104.tar.xz", "needsAuth": true, - "sha256": "07f8hcyf4hmf9lpa2ljm6ygpaaj2yd28da4krwa5yzjvqs88b4fq", + "sha256": "0aizllbfzbn2j0560n4f823jqq7v7qz813an4wlm39rfsfx7b0vq", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.101/alpha/linux64", - "version": "1.1.101" + "url": "https://factorio.com/get-download/1.1.104/alpha/linux64", + "version": "1.1.104" }, "stable": { - "name": "factorio_alpha_x64-1.1.101.tar.xz", + "name": "factorio_alpha_x64-1.1.104.tar.xz", "needsAuth": true, - "sha256": "07f8hcyf4hmf9lpa2ljm6ygpaaj2yd28da4krwa5yzjvqs88b4fq", + "sha256": "0aizllbfzbn2j0560n4f823jqq7v7qz813an4wlm39rfsfx7b0vq", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.101/alpha/linux64", - "version": "1.1.101" + "url": "https://factorio.com/get-download/1.1.104/alpha/linux64", + "version": "1.1.104" } }, "demo": { "experimental": { - "name": "factorio_demo_x64-1.1.101.tar.xz", + "name": "factorio_demo_x64-1.1.104.tar.xz", "needsAuth": false, - "sha256": "14cnz4y1iqjv8ks0w1k60qy1nqjn33wajwzdpnmxgcz01rzfqd8a", + "sha256": "0x08dy6pagfpqc9c2cl239b1f7pf0p4cghzp7avxmbkmbl1fan2l", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.101/demo/linux64", - "version": "1.1.101" + "url": "https://factorio.com/get-download/1.1.104/demo/linux64", + "version": "1.1.104" }, "stable": { - "name": "factorio_demo_x64-1.1.101.tar.xz", + "name": "factorio_demo_x64-1.1.104.tar.xz", "needsAuth": false, - "sha256": "14cnz4y1iqjv8ks0w1k60qy1nqjn33wajwzdpnmxgcz01rzfqd8a", + "sha256": "0x08dy6pagfpqc9c2cl239b1f7pf0p4cghzp7avxmbkmbl1fan2l", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.101/demo/linux64", - "version": "1.1.101" + "url": "https://factorio.com/get-download/1.1.104/demo/linux64", + "version": "1.1.104" } }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.101.tar.xz", + "name": "factorio_headless_x64-1.1.104.tar.xz", "needsAuth": false, - "sha256": "14l3cg8swl3l7lzp44j4zk9wldzf4g23vda67wyzfyx82pvad206", + "sha256": "10qmq2mw2j97s64skwr3m7hmv21h3m0r8rdhnyfrhmrxn8x3a4wf", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.101/headless/linux64", - "version": "1.1.101" + "url": "https://factorio.com/get-download/1.1.104/headless/linux64", + "version": "1.1.104" }, "stable": { - "name": "factorio_headless_x64-1.1.101.tar.xz", + "name": "factorio_headless_x64-1.1.104.tar.xz", "needsAuth": false, - "sha256": "14l3cg8swl3l7lzp44j4zk9wldzf4g23vda67wyzfyx82pvad206", + "sha256": "10qmq2mw2j97s64skwr3m7hmv21h3m0r8rdhnyfrhmrxn8x3a4wf", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.101/headless/linux64", - "version": "1.1.101" + "url": "https://factorio.com/get-download/1.1.104/headless/linux64", + "version": "1.1.104" } } } diff --git a/nixpkgs/pkgs/games/freeciv/default.nix b/nixpkgs/pkgs/games/freeciv/default.nix index bccec663dbaa..9ff36c949ce3 100644 --- a/nixpkgs/pkgs/games/freeciv/default.nix +++ b/nixpkgs/pkgs/games/freeciv/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "freeciv"; - version = "3.0.9"; + version = "3.0.10"; src = fetchFromGitHub { owner = "freeciv"; repo = "freeciv"; rev = "R${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-vtkGV97FG43HIKPJ/of7jXWSrwHWgHUjwtq0XJPeKws="; + hash = "sha256-f+VJYWsfsoGLs9Ypk5cJQgn86PhsJ/6ODDjlnp84Frg="; }; postPatch = '' diff --git a/nixpkgs/pkgs/games/heroic/default.nix b/nixpkgs/pkgs/games/heroic/default.nix index ef3f13dc1bf0..03165fa5df7d 100644 --- a/nixpkgs/pkgs/games/heroic/default.nix +++ b/nixpkgs/pkgs/games/heroic/default.nix @@ -17,18 +17,18 @@ let appName = "heroic"; in stdenv.mkDerivation rec { pname = "heroic-unwrapped"; - version = "2.12.1"; + version = "2.13.0"; src = fetchFromGitHub { owner = "Heroic-Games-Launcher"; repo = "HeroicGamesLauncher"; rev = "v${version}"; - hash = "sha256-dfyyxE2U5rSSoTY2L5bKsnjQ8u53GgAXa+V+idDr51Q="; + hash = "sha256-02agp4EGT23QBKC8j1JIAkzVLRykFl55aH/wPF0bU/Y="; }; offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-27r6lZiD1Ptk0WIYdwNLSZy6iMnmaZjKXBUjr+5+1lQ="; + hash = "sha256-hd0wY1an12zY0E6VPjiD23Mn5ZDPvFvIdu6FGoc7nYY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/games/minesweep-rs/default.nix b/nixpkgs/pkgs/games/minesweep-rs/default.nix index b2445fe904a5..454be1129634 100644 --- a/nixpkgs/pkgs/games/minesweep-rs/default.nix +++ b/nixpkgs/pkgs/games/minesweep-rs/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "minesweep-rs"; - version = "6.0.52"; + version = "6.0.54"; src = fetchFromGitHub { owner = "cpcloud"; repo = pname; rev = "v${version}"; - hash = "sha256-XSB0SrZCXnIeZGYAc/MEWe+rM5D36jkM2MJjx64r/bU="; + hash = "sha256-FzMCqsPBcbblItRzfnY43glY4We9jk0eBxjG0SZnau8="; }; - cargoHash = "sha256-zSEJsUKLfjZVZxQBtbUflYv4FXUpFCrAGI+6YUJrNnI="; + cargoHash = "sha256-VjIn4k/OuxsXLJ2LOk43LKHo0PrPyMigNOO2VVYZQYw="; meta = with lib; { description = "Sweep some mines for fun, and probably not for profit"; diff --git a/nixpkgs/pkgs/games/openmw/tes3mp.nix b/nixpkgs/pkgs/games/openmw/tes3mp.nix index 5662f2356833..915c006f9137 100644 --- a/nixpkgs/pkgs/games/openmw/tes3mp.nix +++ b/nixpkgs/pkgs/games/openmw/tes3mp.nix @@ -27,6 +27,16 @@ let sha256 = "WIaJkSQnoOm9T7GoAwmWl7fNg79coIo/ILUsWcbH+lA="; }; + patches = [ + # gcc-13 build fix: + # https://github.com/TES3MP/CrabNet/pull/18 + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/TES3MP/CrabNet/commit/3ec9a338a7cefd5cc751c9d29095cafa4c73be20.patch"; + hash = "sha256-zE87icjX9GSnApgKQXj0K4IjlrReV/upFLjVgNYkNfM="; + }) + ]; + cmakeFlags = [ "-DCRABNET_ENABLE_DLL=OFF" ]; @@ -88,9 +98,18 @@ let ''; patches = [ + # glibc-2.34 support (fetchpatch { url = "https://gitlab.com/OpenMW/openmw/-/commit/98a7d90ee258ceef9c70b0b2955d0458ec46f048.patch"; - sha256 = "sha256-RhbIGeE6GyqnipisiMTwWjcFnIiR055hUPL8IkjPgZw="; + hash = "sha256-RhbIGeE6GyqnipisiMTwWjcFnIiR055hUPL8IkjPgZw="; + }) + + # gcc-13 build fix: + # https://github.com/TES3MP/TES3MP/pull/674 + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/TES3MP/TES3MP/commit/7921f71a79e96f817a2009100e5105a7948b3fe2.patch"; + hash = "sha256-mpxuOSPA2xixgBeYXsxutEUI7VJL5PxAeZgaNU7YkJQ="; }) # https://github.com/TES3MP/openmw-tes3mp/issues/552 diff --git a/nixpkgs/pkgs/games/openrct2/default.nix b/nixpkgs/pkgs/games/openrct2/default.nix index c38c1ae8031d..485b7104b20a 100644 --- a/nixpkgs/pkgs/games/openrct2/default.nix +++ b/nixpkgs/pkgs/games/openrct2/default.nix @@ -30,7 +30,7 @@ }: let - openrct2-version = "0.4.7"; + openrct2-version = "0.4.8"; # Those versions MUST match the pinned versions within the CMakeLists.txt # file. The REPLAYS repository from the CMakeLists.txt is not necessary. @@ -43,7 +43,7 @@ let owner = "OpenRCT2"; repo = "OpenRCT2"; rev = "v${openrct2-version}"; - hash = "sha256-2nSzXbZH1o+BEaxhdQTCM/u4Qbun4tqBKjQ4z7owHeg="; + hash = "sha256-jSKAgohNMHuyOu4gUHyyZf1I7UrsXGDV5XwwK1DQPyM="; }; objects-src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/games/osu-lazer/update-bin.sh b/nixpkgs/pkgs/games/osu-lazer/update-bin.sh index 0aa5e97751b9..182875a42731 100755 --- a/nixpkgs/pkgs/games/osu-lazer/update-bin.sh +++ b/nixpkgs/pkgs/games/osu-lazer/update-bin.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=../../../. -i bash -p unzip curl jq common-updater-scripts +#!nix-shell -I nixpkgs=./. -i bash -p unzip curl jq common-updater-scripts set -eo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" diff --git a/nixpkgs/pkgs/games/osu-lazer/update.sh b/nixpkgs/pkgs/games/osu-lazer/update.sh index 8e9849db1e16..7ef726621a09 100755 --- a/nixpkgs/pkgs/games/osu-lazer/update.sh +++ b/nixpkgs/pkgs/games/osu-lazer/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=../../../. -i bash -p curl jq common-updater-scripts +#!nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts set -eo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" diff --git a/nixpkgs/pkgs/games/pysolfc/default.nix b/nixpkgs/pkgs/games/pysolfc/default.nix index c543434b610d..7315d5e2724f 100644 --- a/nixpkgs/pkgs/games/pysolfc/default.nix +++ b/nixpkgs/pkgs/games/pysolfc/default.nix @@ -7,21 +7,21 @@ }: buildPythonApplication rec { - pname = "PySolFC"; - version = "2.20.1"; + pname = "pysolfc"; + version = "2.21.0"; src = fetchzip { - url = "https://versaweb.dl.sourceforge.net/project/pysolfc/PySolFC/PySolFC-${version}/PySolFC-${version}.tar.xz"; - hash = "sha256-mEnsq8Su0ses+nqoSFC+Wr0MHY7aTDMbtDV8toYVNPY="; + url = "mirror://sourceforge/pysolfc/PySolFC-${version}.tar.xz"; + hash = "sha256-Deye7KML5G6RZkth2veVgPOWZI8gnusEvszlrPTAhag="; }; cardsets = fetchzip { - url = "https://versaweb.dl.sourceforge.net/project/pysolfc/PySolFC-Cardsets/PySolFC-Cardsets-2.2/PySolFC-Cardsets-2.2.tar.bz2"; + url = "mirror://sourceforge/pysolfc/PySolFC-Cardsets-2.2.tar.bz2"; hash = "sha256-mWJ0l9rvn9KeZ9rCWy7VjngJzJtSQSmG8zGcYFE4yM0="; }; music = fetchzip { - url = "https://versaweb.dl.sourceforge.net/project/pysolfc/PySol-Music/PySol-Music-4.50/pysol-music-4.50.tar.xz"; + url = "mirror://sourceforge/pysolfc/pysol-music-4.50.tar.xz"; hash = "sha256-sOl5U98aIorrQHJRy34s0HHaSW8hMUE7q84FMQAj5Yg="; }; diff --git a/nixpkgs/pkgs/games/speed-dreams/default.nix b/nixpkgs/pkgs/games/speed-dreams/default.nix index a44c3d670558..bdfc68f837d1 100644 --- a/nixpkgs/pkgs/games/speed-dreams/default.nix +++ b/nixpkgs/pkgs/games/speed-dreams/default.nix @@ -1,9 +1,9 @@ { fetchurl, lib, stdenv, libGLU, libGL, freeglut, libX11, plib, openal, freealut, libXrandr, xorgproto, libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, openscenegraph, expat, -libpng, zlib, bash, SDL2, enet, libjpeg, cmake, pkg-config, libvorbis, runtimeShell, curl }: +libpng, zlib, bash, SDL2, SDL2_mixer, enet, libjpeg, cmake, pkg-config, libvorbis, runtimeShell, curl, copyDesktopItems, makeDesktopItem }: let - version = "2.2.3-r7616"; + version = "2.3.0-r8786"; shortVersion = builtins.substring 0 5 version; in stdenv.mkDerivation rec { @@ -12,22 +12,22 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/speed-dreams/${shortVersion}/speed-dreams-src-base-${version}.tar.xz"; - sha256 = "sha256-GvB8SDZB9UivJSsQfMMon9N5MURdxTOwsaN4F0XQUCE="; + sha256 = "sha256-DUyMs9Hr1PYgmNVwBY/e6snVeGl9GX0AnZ7S+TFABKQ="; }; cars-and-tracks = fetchurl { url = "mirror://sourceforge/speed-dreams/${shortVersion}/speed-dreams-src-hq-cars-and-tracks-${version}.tar.xz"; - sha256 = "sha256-BuryCUvBD7rKmApCNsTkRN0UJ1q6P3sdYrSzpTqdTHc="; + sha256 = "sha256-WT+W6uuw4BRSbF1Cw123q3v9qSCvBQ7TcQ/Y0RV/7Js="; }; more-cars-and-tracks = fetchurl { url = "mirror://sourceforge/speed-dreams/${shortVersion}/speed-dreams-src-more-hq-cars-and-tracks-${version}.tar.xz"; - sha256 = "sha256-GSCHYbJS352yAMczzss7tYSQXwLQV68rv/XkyGy+GoY="; + sha256 = "sha256-psApv+Z1HDFvh5bzt125mo/ZvO5rjee/KhOf45iKnKk="; }; wip-cars-and-tracks = fetchurl { url = "mirror://sourceforge/speed-dreams/${shortVersion}/speed-dreams-src-wip-cars-and-tracks-${version}.tar.xz"; - sha256 = "sha256-r/IOSf+UZg2e+WIHn2QNDO6qQUhpIJvh7EF2jQ7lyyA="; + sha256 = "sha256-OEAbqFfO2PzHP7+eAtPNn3Ql6fYNTKzzQW8lHe9KDXM="; }; sourceRoot = "."; @@ -54,16 +54,30 @@ stdenv.mkDerivation rec { echo "$i"' "$@"' >> "$out/bin/$(basename "$i")" chmod a+x "$out/bin/$(basename "$i")" done + + mkdir -p $out/share/pixmaps/ + ln -s "$out/share/games/speed-dreams-2/data/icons/icon.png" "$out/share/pixmaps/speed-dreams-2.png" ''; + desktopItems = [ + (makeDesktopItem { + name = "Speed Dreams 2"; + exec = "speed-dreams-2"; + icon = "speed-dreams-2.png"; + desktopName = "speed-dreams-2"; + comment = "The Open Racing Car Simulator Fork"; + categories = [ "Application" "Game" ]; + }) + ]; + # RPATH of binary /nix/store/.../lib64/games/speed-dreams-2/drivers/shadow_sc/shadow_sc.so contains a forbidden reference to /build/ cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; - nativeBuildInputs = [ pkg-config cmake ]; + nativeBuildInputs = [ pkg-config cmake copyDesktopItems ]; buildInputs = [ libpng libGLU libGL freeglut libX11 plib openal freealut libXrandr xorgproto libXext libSM libICE libXi libXt libXrender libXxf86vm zlib bash expat - SDL2 enet libjpeg openscenegraph libvorbis curl ]; + SDL2 SDL2_mixer enet libjpeg openscenegraph libvorbis curl ]; meta = { description = "Car racing game - TORCS fork with more experimental approach"; diff --git a/nixpkgs/pkgs/games/starsector/default.nix b/nixpkgs/pkgs/games/starsector/default.nix index 72ca3f5b897b..12b3fa5665d8 100644 --- a/nixpkgs/pkgs/games/starsector/default.nix +++ b/nixpkgs/pkgs/games/starsector/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "starsector"; - version = "0.97a-RC8"; + version = "0.97a-RC10"; src = fetchzip { url = "https://f005.backblazeb2.com/file/fractalsoftworks/release/starsector_linux-${version}.zip"; - sha256 = "sha256-mfx6tmgIT+bMEpMXAcHVMMJMr1zlALStpoUxYw8MYsY="; + sha256 = "sha256-GTzFY7iUB0xtUk9di8LKAgZwCOjqvv2j5QFSUKAfNDU="; }; nativeBuildInputs = [ copyDesktopItems makeWrapper ]; diff --git a/nixpkgs/pkgs/games/stone-kingdoms/default.nix b/nixpkgs/pkgs/games/stone-kingdoms/default.nix index e49db727b9e8..3138e1fc3aa8 100644 --- a/nixpkgs/pkgs/games/stone-kingdoms/default.nix +++ b/nixpkgs/pkgs/games/stone-kingdoms/default.nix @@ -11,13 +11,13 @@ stdenvNoCC.mkDerivation rec { pname = "stone-kingdoms"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitLab { owner = "stone-kingdoms"; repo = pname; rev = version; - hash = "sha256-FQrg/1/nfFC/irCWSLbnb9GYSUv//ovvcjzvIg94oEI="; + hash = "sha256-qdaGowzAmMSCJrXzWLPDmyICsmvs0w+tfTsqKQewzJ8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/games/torcs/default.nix b/nixpkgs/pkgs/games/torcs/default.nix index 4764db4413ed..9c712ae41a43 100644 --- a/nixpkgs/pkgs/games/torcs/default.nix +++ b/nixpkgs/pkgs/games/torcs/default.nix @@ -30,6 +30,11 @@ stdenv.mkDerivation rec { }) ]; + postInstall = '' + install -D -m644 Ticon.png $out/share/pixmaps/torcs.png + install -D -m644 torcs.desktop $out/share/applications/torcs.desktop + ''; + postPatch = '' sed -i -e s,/bin/bash,`type -P bash`, src/linux/torcs.in ''; diff --git a/nixpkgs/pkgs/games/trigger/default.nix b/nixpkgs/pkgs/games/trigger/default.nix index cb3227f24e3e..57bc75d53820 100644 --- a/nixpkgs/pkgs/games/trigger/default.nix +++ b/nixpkgs/pkgs/games/trigger/default.nix @@ -1,5 +1,5 @@ { lib, fetchurl, stdenv, runtimeShell, SDL2, freealut, SDL2_image, openal, physfs -, zlib, libGLU, libGL, glew, tinyxml-2 }: +, zlib, libGLU, libGL, glew, tinyxml-2, copyDesktopItems, makeDesktopItem }: stdenv.mkDerivation rec { pname = "trigger-rally"; @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "016bc2hczqscfmngacim870hjcsmwl8r3aq8x03vpf22s49nw23z"; }; + nativeBuildInputs = [ copyDesktopItems ]; + buildInputs = [ SDL2 freealut @@ -42,8 +44,22 @@ stdenv.mkDerivation rec { exec $out/games/trigger-rally "$@" EOF chmod +x $out/bin/trigger-rally + + mkdir -p $out/share/pixmaps/ + ln -s $out/share/games/trigger-rally/icon/trigger-rally-icons.svg $out/share/pixmaps/trigger.svg ''; + desktopItems = [ + (makeDesktopItem { + name = "Trigger"; + exec = "trigger-rally"; + icon = "trigger"; + desktopName = "Trigger"; + comment = "Fast-paced 3D single-player rally racing game"; + categories = [ "Game" "ActionGame" ]; + }) + ]; + meta = { description = "A fast-paced single-player racing game"; homepage = "http://trigger-rally.sourceforge.net/"; |