diff options
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/airshipper/default.nix | 7 | ||||
-rw-r--r-- | pkgs/games/dwarf-fortress/themes/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/katago/default.nix | 6 | ||||
-rw-r--r-- | pkgs/games/lunar-client/default.nix | 8 | ||||
-rw-r--r-- | pkgs/games/openxcom/default.nix | 1 | ||||
-rw-r--r-- | pkgs/games/polymc/default.nix | 11 | ||||
-rw-r--r-- | pkgs/games/rare/default.nix | 64 | ||||
-rw-r--r-- | pkgs/games/spring/springlobby.nix | 1 | ||||
-rw-r--r-- | pkgs/games/steam/fhsenv.nix | 4 |
9 files changed, 84 insertions, 20 deletions
diff --git a/pkgs/games/airshipper/default.nix b/pkgs/games/airshipper/default.nix index 4474d09659e5..4fc37b0ca25c 100644 --- a/pkgs/games/airshipper/default.nix +++ b/pkgs/games/airshipper/default.nix @@ -3,6 +3,7 @@ , fetchFromGitLab , fetchpatch , openssl +, libGL , vulkan-loader , wayland , wayland-protocols @@ -49,14 +50,14 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config makeWrapper ]; postInstall = '' - mkdir -p "$out/share/applications" && mkdir -p "$out/share/icons" - cp "client/assets/net.veloren.airshipper.desktop" "$out/share/applications" - cp "client/assets/logo.ico" "$out/share/icons/net.veloren.airshipper.ico" + install -Dm444 -t "$out/share/applications" "client/assets/net.veloren.airshipper.desktop" + install -Dm444 "client/assets/logo.ico" "$out/share/icons/net.veloren.airshipper.ico" ''; postFixup = let libPath = lib.makeLibraryPath [ + libGL vulkan-loader wayland wayland-protocols diff --git a/pkgs/games/dwarf-fortress/themes/default.nix b/pkgs/games/dwarf-fortress/themes/default.nix index c6987a1d16bd..d2e2ec5fd19b 100644 --- a/pkgs/games/dwarf-fortress/themes/default.nix +++ b/pkgs/games/dwarf-fortress/themes/default.nix @@ -6,7 +6,7 @@ listToAttrs (map (v: { inherit (v) name; value = fetchFromGitHub { - name = "${v.name}-${v.version}"; + name = "${v.name}-theme-${v.version}"; owner = "DFgraphics"; repo = v.name; rev = v.version; diff --git a/pkgs/games/katago/default.nix b/pkgs/games/katago/default.nix index abfeca69e82d..3265f3d63382 100644 --- a/pkgs/games/katago/default.nix +++ b/pkgs/games/katago/default.nix @@ -29,14 +29,14 @@ assert !enableGPU -> ( # of gcc. If you need to use cuda10, please override stdenv with gcc8Stdenv stdenv.mkDerivation rec { pname = "katago"; - version = "1.10.0"; - githash = "ff49d04ad6bcfa056c63492439a41e2f3bce0847"; + version = "1.11.0"; + githash = "d8d0cd76cf73df08af3d7061a639488ae9494419"; src = fetchFromGitHub { owner = "lightvector"; repo = "katago"; rev = "v${version}"; - sha256 = "sha256-ZLJNNjZ5RdOktWDp88d/ItpokANl2EJ0Gbt9oMGm1Og="; + sha256 = "sha256-TZKkkYe2PPzgPhItBZBSJDwU3anhsujuCGIYru55OtU="; }; fakegit = writeShellScriptBin "git" "echo ${githash}"; diff --git a/pkgs/games/lunar-client/default.nix b/pkgs/games/lunar-client/default.nix index fbebe85cf007..17df2565b866 100644 --- a/pkgs/games/lunar-client/default.nix +++ b/pkgs/games/lunar-client/default.nix @@ -2,13 +2,13 @@ let name = "lunar-client"; - version = "2.9.3"; + version = "2.10.0"; desktopItem = makeDesktopItem { name = "lunar-client"; exec = "lunar-client"; icon = "lunarclient"; - comment = "Minecraft 1.7, 1.8, 1.12, 1.15, and 1.16 Client"; + comment = "Minecraft 1.7, 1.8, 1.12, 1.15, 1.16, 1.17, and 1.18 Client"; desktopName = "Lunar Client"; genericName = "Minecraft Client"; categories = [ "Game" ]; @@ -21,7 +21,7 @@ let src = fetchurl { url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage"; name = "lunar-client.AppImage"; - sha256 = "sha256-2wlC+OAG2lvUB3yPxppNhhvNDZv4gxrNKpww9vAfStI="; + sha256 = "1kfi3rgy401ll3gn9k30j0a1zds1ghl5g2ibfwlsnr826nckfmzw"; }; in appimageTools.wrapType1 rec { @@ -36,7 +36,7 @@ appimageTools.wrapType1 rec { extraPkgs = pkgs: [ pkgs.libpulseaudio ]; meta = with lib; { - description = "Minecraft 1.7, 1.8, 1.12, 1.15, and 1.16 Client"; + description = "Minecraft 1.7, 1.8, 1.12, 1.15, 1.16, 1.17, and 1.18 Client"; homepage = "https://www.lunarclient.com/"; license = with licenses; [ unfree ]; maintainers = with maintainers; [ zyansheep Technical27 ]; diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix index 8c115e9b3120..b877c3aac2fd 100644 --- a/pkgs/games/openxcom/default.nix +++ b/pkgs/games/openxcom/default.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation { meta = { description = "Open source clone of UFO: Enemy Unknown"; homepage = "https://openxcom.org"; - repositories.git = "https://github.com/SupSuper/OpenXcom.git"; maintainers = [ lib.maintainers.cpages ]; platforms = lib.platforms.linux; license = lib.licenses.gpl3; diff --git a/pkgs/games/polymc/default.nix b/pkgs/games/polymc/default.nix index 0d63a8ad5f91..0ec60d617f02 100644 --- a/pkgs/games/polymc/default.nix +++ b/pkgs/games/polymc/default.nix @@ -11,18 +11,20 @@ , libpulseaudio , qtbase , libGL +, glfw +, openal , msaClientID ? "" }: mkDerivation rec { pname = "polymc"; - version = "1.0.6"; + version = "1.1.0"; src = fetchFromGitHub { owner = "PolyMC"; repo = "PolyMC"; rev = version; - sha256 = "sha256-KgLWbZxtxTpuFdMOJNyADYw9rMWoLgczrbSrH4qv6NI="; + sha256 = "sha256-p5vbpNZI/JiQJclEo/Pu/46qVul+3DAzaoow8jabHrI="; fetchSubmodules = true; }; @@ -36,7 +38,7 @@ mkDerivation rec { --replace 'scanJavaDir("/usr/lib32/jvm")' 'javas.append("${jdk8}/lib/openjdk/bin/java")' ''; - cmakeFlags = [ "-DLauncher_LAYOUT=lin-system" ] ++ + cmakeFlags = [ "-DLauncher_PORTABLE=0" ] ++ lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ]; dontWrapQtApps = true; @@ -50,6 +52,8 @@ mkDerivation rec { libXxf86vm libpulseaudio libGL + glfw + openal ]; in '' # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 @@ -68,6 +72,7 @@ mkDerivation rec { their associated options with a simple interface. ''; platforms = platforms.linux; + changelog = "https://github.com/PolyMC/PolyMC/releases/tag/${version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ cleverca22 starcraft66 ]; }; diff --git a/pkgs/games/rare/default.nix b/pkgs/games/rare/default.nix new file mode 100644 index 000000000000..9bf3aca75422 --- /dev/null +++ b/pkgs/games/rare/default.nix @@ -0,0 +1,64 @@ +{ lib, fetchPypi, buildPythonApplication, makeDesktopItem, copyDesktopItems, qt5 +, pillow, psutil, pypresence, pyqt5, python, qtawesome, requests }: + +buildPythonApplication rec { + pname = "rare"; + version = "1.8.8"; + + src = fetchPypi { + inherit version; + pname = "Rare"; + sha256 = "sha256-00CtvBqSrT9yJUHZ5529VrIQtCOYkHRc8+rJHmrTSpg="; + }; + + nativeBuildInputs = [ + copyDesktopItems + qt5.wrapQtAppsHook + ]; + + propagatedBuildInputs = [ + pillow + psutil + pypresence + pyqt5 + qtawesome + requests + ]; + + desktopItems = [ + (makeDesktopItem { + name = pname; + exec = "rare"; + icon = "Rare"; + comment = meta.description; + desktopName = "Rare"; + genericName = "Rare (Epic Games Launcher Open Source Alternative)"; + }) + ]; + + dontWrapQtApps = true; + + preBuild = '' + # Solves "PermissionError: [Errno 13] Permission denied: '/homeless-shelter'" + export HOME=$(mktemp -d) + ''; + + postInstall = '' + install -Dm644 $out/${python.sitePackages}/rare/resources/images/Rare.png -t $out/share/pixmaps/ + ''; + + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + ''; + + # Project has no tests + doCheck = false; + + meta = with lib; { + description = "GUI for Legendary, an Epic Games Launcher open source alternative"; + homepage = "https://github.com/Dummerle/Rare"; + maintainers = with maintainers; [ wolfangaukang ]; + license = licenses.gpl3Only; + platforms = platforms.linux; + }; +} diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix index bf603e2f5308..55c61c4cbd82 100644 --- a/pkgs/games/spring/springlobby.nix +++ b/pkgs/games/spring/springlobby.nix @@ -34,7 +34,6 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://springlobby.info/"; - repositories.git = "git://github.com/springlobby/springlobby.git"; description = "Cross-platform lobby client for the Spring RTS project"; license = licenses.gpl2; maintainers = with maintainers; [ qknight domenkozar ]; diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index 37ec8ef8c7e2..c5fba68b22a1 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -131,7 +131,6 @@ in buildFHSUserEnv rec { rtmpdump # dependencies for mesa drivers, needed inside pressure-vessel - mesa.drivers mesa.llvmPackages.llvm.lib vulkan-loader expat @@ -229,9 +228,6 @@ in buildFHSUserEnv rec { export TZ="$new_TZ" fi fi - - # XDG_DATA_DIRS is used by pressure-vessel and vulkan loaders to find the corresponding icd - export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}/run/opengl-driver/share:/run/opengl-driver-32/share '' + extraProfile; runScript = writeScript "steam-wrapper.sh" '' |