diff --git a/pkgs/by-name/ze/zeroad-data/package.nix b/pkgs/by-name/ze/zeroad-data/package.nix index 1a2fc18052ec..74eea77ad053 100644 --- a/pkgs/by-name/ze/zeroad-data/package.nix +++ b/pkgs/by-name/ze/zeroad-data/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://releases.wildfiregames.com/0ad-${version}-unix-data.tar.xz"; - hash = "sha256-PkiFWrjh74EnAzhGLIJwsBUhPxT14FSquSrXTV6lneo="; + hash = "sha256-g34tbd8TiwJfwCAXJF11gaS7hP2UtCwOYF0yG3AXqZg="; }; installPhase = '' diff --git a/pkgs/by-name/ze/zeroad-unwrapped/fix-build-script.patch b/pkgs/by-name/ze/zeroad-unwrapped/fix-build-script.patch deleted file mode 100644 index be341779561d..000000000000 --- a/pkgs/by-name/ze/zeroad-unwrapped/fix-build-script.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/libraries/build-source-libs.sh b/libraries/build-source-libs.sh -index 323260a5..da67b293 100755 ---- a/libraries/build-source-libs.sh -+++ b/libraries/build-source-libs.sh -@@ -62,7 +62,7 @@ while [ "$#" -gt 0 ]; do - --with-system-cxxtest) with_system_cxxtest=true ;; - --with-system-nvtt) with_system_nvtt=true ;; - --with-system-mozjs) with_system_mozjs=true ;; -- --with-system-premake) with_system_mozjs=true ;; -+ --with-system-premake) with_system_premake=true ;; - --with-spirv-reflect) with_spirv_reflect=true ;; - -j*) JOBS="$1" ;; - *) diff --git a/pkgs/by-name/ze/zeroad-unwrapped/package.nix b/pkgs/by-name/ze/zeroad-unwrapped/package.nix index 58298f94c1ea..bfa07cc46860 100644 --- a/pkgs/by-name/ze/zeroad-unwrapped/package.nix +++ b/pkgs/by-name/ze/zeroad-unwrapped/package.nix @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { pname = "0ad"; - version = "0.27.0"; + version = "0.27.1"; src = fetchurl { url = "http://releases.wildfiregames.com/0ad-${version}-unix-build.tar.xz"; - hash = "sha256-qpSFcAl1DV9h2/AWvBUOO9y9s6zfyK0gtzq4tD6aG6Y="; + hash = "sha256-oKU1XutZaNJPKDdwc2FQ2XTa/sugd1TUZicH3BcBa/s="; }; nativeBuildInputs = [ @@ -101,10 +101,6 @@ stdenv.mkDerivation rec { patches = [ ./rootdir_env.patch - # Fix build script when using system premake - # https://gitea.wildfiregames.com/0ad/0ad/pulls/7571 - # FIXME: Remove with next package update - ./fix-build-script.patch ]; configurePhase = ''