diff options
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/gcompris/default.nix | 24 | ||||
-rw-r--r-- | pkgs/games/terraria-server/default.nix | 4 |
2 files changed, 19 insertions, 9 deletions
diff --git a/pkgs/games/gcompris/default.nix b/pkgs/games/gcompris/default.nix index c4c737d228c..5343bae4a6c 100644 --- a/pkgs/games/gcompris/default.nix +++ b/pkgs/games/gcompris/default.nix @@ -18,11 +18,11 @@ mkDerivation rec { pname = "gcompris"; - version = "2.1"; + version = "2.3"; src = fetchurl { - url = "http://gcompris.net/download/qt/src/gcompris-qt-${version}.tar.xz"; - sha256 = "sha256-ljOY/uybXzfwOFmhBXB4sC4Vn/C8BP1BeUUPpdHuQwo="; + url = "https://download.kde.org/stable/gcompris/qt/src/gcompris-qt-${version}.tar.xz"; + sha256 = "sha256-UgWLp5IVqbeFFCO/PRFJ/X1sPm7nSkagVcgEp5SdzGI="; }; cmakeFlags = [ @@ -32,15 +32,24 @@ mkDerivation rec { nativeBuildInputs = [ cmake gettext ninja qttools ]; buildInputs = [ - qmlbox2d qtbase qtdeclarative qtgraphicaleffects qtmultimedia qtquickcontrols qtsensors qtxmlpatterns + qmlbox2d + qtdeclarative + qtgraphicaleffects + qtmultimedia + qtquickcontrols + qtsensors + qtxmlpatterns ] ++ (with gst_all_1; [ - gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad ]); postInstall = '' - install -Dm444 ../org.kde.gcompris.desktop $out/share/applications/gcompris.desktop - install -Dm444 ../images/256-apps-gcompris-qt.png $out/share/icons/hicolor/256x256/apps/gcompris-qt.png + install -Dm444 ../org.kde.gcompris.desktop -t $out/share/applications install -Dm444 ../org.kde.gcompris.appdata.xml -t $out/share/metainfo + install -Dm444 ../images/256-apps-gcompris-qt.png $out/share/icons/hicolor/256x256/apps/gcompris-qt.png qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") ''; @@ -49,6 +58,7 @@ mkDerivation rec { description = "A high quality educational software suite, including a large number of activities for children aged 2 to 10"; homepage = "https://gcompris.net/"; license = licenses.gpl3Plus; + mainProgram = "gcompris-qt"; maintainers = with maintainers; [ guibou ]; platforms = platforms.linux; }; diff --git a/pkgs/games/terraria-server/default.nix b/pkgs/games/terraria-server/default.nix index 0100418326d..cd4895fc064 100644 --- a/pkgs/games/terraria-server/default.nix +++ b/pkgs/games/terraria-server/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "terraria-server"; - version = "1.4.3.5"; + version = "1.4.3.6"; urlVersion = lib.replaceChars [ "." ] [ "" ] version; src = fetchurl { url = "https://terraria.org/api/download/pc-dedicated-server/terraria-server-${urlVersion}.zip"; - sha256 = "sha256-N1GnxEe0A6Wuzy08lL3CFPWjQJECGGf504FE+lnhDcw="; + sha256 = "sha256-OFI7U6Mqu09pIbgJQs0O+GS8jf1uVuhAVEJhYNYXrBE="; }; buildInputs = [ file ]; |