Unverified Commit 502f72c9 authored by Yohann Boniface's avatar Yohann Boniface Committed by GitHub
Browse files

zeroad: 0.27.0 -> 0.27.1 (#426110)

parents e86f578d a25a705f

pkgs/by-name/ze/zeroad-data/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -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 = ''

pkgs/by-name/ze/zeroad-unwrapped/fix-build-script.patch

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
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" ;;

 		*)

pkgs/by-name/ze/zeroad-unwrapped/package.nix

+2 −6
Original line number Diff line number Diff line
@@ -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 = [
@@ -102,10 +102,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 = ''