From 618a4945cf34672c70769760c138a840fbd070ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 29 Jan 2024 23:47:56 +0000 Subject: [PATCH 1/2] unciv: 4.9.19 -> 4.10.4 --- pkgs/games/unciv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix index 6ab635e9a664..9d556708e384 100644 --- a/pkgs/games/unciv/default.nix +++ b/pkgs/games/unciv/default.nix @@ -27,11 +27,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "4.9.19"; + version = "4.10.4"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - hash = "sha256-C591QKk36v4GAO2oXLOHE4B2RpOObtriN6EPC+xXKnc="; + hash = "sha256-GWGmb3xAMwb7rLMQfW9CzXke9aqXjMWlPILoZiaUHPE="; }; dontUnpack = true; From d14fb68aabe758248d496e5f76c95d73731aae56 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 30 Jan 2024 06:42:04 +0100 Subject: [PATCH 2/2] unciv: drop envLibPath on darwin --- pkgs/games/unciv/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix index 9d556708e384..39e916b41726 100644 --- a/pkgs/games/unciv/default.nix +++ b/pkgs/games/unciv/default.nix @@ -18,11 +18,11 @@ let categories = [ "Game" ]; }; - envLibPath = lib.makeLibraryPath [ + envLibPath = lib.makeLibraryPath (lib.optionals stdenv.isLinux [ libGL libpulseaudio libXxf86vm - ]; + ]); in stdenv.mkDerivation rec { @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { runHook preInstall makeWrapper ${jre}/bin/java $out/bin/unciv \ - --prefix LD_LIBRARY_PATH : ${envLibPath} \ + --prefix LD_LIBRARY_PATH : "${envLibPath}" \ --prefix PATH : ${lib.makeBinPath [ jre ]} \ --add-flags "-jar ${src}"