commit d9c8f65a6571c407145fbf7bbc47e7fb903c818a · pyrox.dev/nixpkgs

+2 -2

pkgs/games/0ad/data.nix

···

       10
       10
        
         inherit (zeroad-unwrapped) version;

     

       11
       11
        
       

     

       12
       12
        
         src = fetchurl {

     

       13
       13
       -
           url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz";

     

       14
       14
       -
           sha256 = "sgDkhVj4goB5EOPGhlZ7ajliSNnUGAROz94JCwV3LX0=";

     

       13
       13
       +
           url = "http://releases.wildfiregames.com/0ad-${version}-unix-data.tar.xz";

     

       14
       14
       +
           hash = "sha256-PkiFWrjh74EnAzhGLIJwsBUhPxT14FSquSrXTV6lneo=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         installPhase = ''

+13

pkgs/games/0ad/fix-build-script.patch

···

       1
       1
       +
       diff --git a/libraries/build-source-libs.sh b/libraries/build-source-libs.sh

     

       2
       2
       +
       index 323260a5..da67b293 100755

     

       3
       3
       +
       --- a/libraries/build-source-libs.sh

     

       4
       4
       +
       +++ b/libraries/build-source-libs.sh

     

       5
       5
       +
       @@ -62,7 +62,7 @@ while [ "$#" -gt 0 ]; do

     

       6
       6
       +
        		--with-system-cxxtest) with_system_cxxtest=true ;;

     

       7
       7
       +
        		--with-system-nvtt) with_system_nvtt=true ;;

     

       8
       8
       +
        		--with-system-mozjs) with_system_mozjs=true ;;

     

       9
       9
       +
       -		--with-system-premake) with_system_mozjs=true ;;

     

       10
       10
       +
       +		--with-system-premake) with_system_premake=true ;;

     

       11
       11
       +
        		--with-spirv-reflect) with_spirv_reflect=true ;;

     

       12
       12
       +
        		-j*) JOBS="$1" ;;

     

       13
       13
       +
        		*)

+28 -48

pkgs/games/0ad/game.nix

···

       9
       9
        
         fmt,

     

       10
       10
        
         libidn,

     

       11
       11
        
         pkg-config,

     

       12
       12
       -
         spidermonkey_78,

     

       13
       13
       -
         boost183,

     

       12
       12
       +
         spidermonkey_115,

     

       13
       13
       +
         boost,

     

       14
       14
        
         icu,

     

       15
       15
        
         libxml2,

     

       16
       16
        
         libpng,

     
···

       32
       32
        
         SDL2,

     

       33
       33
        
         gloox,

     

       34
       34
        
         nvidia-texture-tools,

     

       35
       35
       +
         premake5,

     

       36
       36
       +
         cxxtest,

     

       35
       37
        
         freetype,

     

       36
       38
        
         withEditor ? true,

     

       37
       39
        
         wxGTK,

     
···

       40
       42
        
       # You can find more instructions on how to build 0ad here:

     

       41
       43
        
       #    https://trac.wildfiregames.com/wiki/BuildInstructions

     

       42
       44
        
       

     

       43
       43
       -
       let

     

       44
       44
       -
         # the game requires a special version 78.6.0 of spidermonkey, otherwise

     

       45
       45
       -
         # we get compilation errors. We override the src attribute of spidermonkey_78

     

       46
       46
       -
         # in order to reuse that declaration, while giving it a different source input.

     

       47
       47
       -
         spidermonkey_78_6 = spidermonkey_78.overrideAttrs (old: rec {

     

       48
       48
       -
           version = "78.6.0";

     

       49
       49
       -
           src = fetchurl {

     

       50
       50
       -
             url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";

     

       51
       51
       -
             sha256 = "0lyg65v380j8i2lrylwz8a5ya80822l8vcnlx3dfqpd3s6zzjsay";

     

       52
       52
       -
           };

     

       53
       53
       -
           patches = (old.patches or [ ]) ++ [

     

       54
       54
       -
             ./spidermonkey-cargo-toml.patch

     

       55
       55
       -
           ];

     

       56
       56
       -
         });

     

       57
       57
       -
       in

     

       58
       45
        
       stdenv.mkDerivation rec {

     

       59
       46
        
         pname = "0ad";

     

       60
       60
       -
         version = "0.0.26";

     

       47
       47
       +
         version = "0.27.0";

     

       61
       48
        
       

     

       62
       49
        
         src = fetchurl {

     

       63
       63
       -
           url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-build.tar.xz";

     

       64
       64
       -
           sha256 = "Lhxt9+MxLnfF+CeIZkz/w6eNO/YGBsAAOSdeHRPA7ks=";

     

       50
       50
       +
           url = "http://releases.wildfiregames.com/0ad-${version}-unix-build.tar.xz";

     

       51
       51
       +
           hash = "sha256-qpSFcAl1DV9h2/AWvBUOO9y9s6zfyK0gtzq4tD6aG6Y=";

     

       65
       52
        
         };

     

       66
       53
        
       

     

       67
       54
        
         nativeBuildInputs = [

     
···

       71
       58
        
         ];

     

       72
       59
        
       

     

       73
       60
        
         buildInputs = [

     

       74
       74
       -
           spidermonkey_78_6

     

       75
       75
       -
           # boost 1.86 fails with the following error:

     

       76
       76
       -
           # error: 'boost::filesystem::wpath' {aka 'class boost::filesystem::path'} has no member named 'leaf'

     

       77
       77
       -
           boost183

     

       61
       61
       +
           spidermonkey_115

     

       62
       62
       +
           boost

     

       78
       63
        
           icu

     

       79
       64
        
           libxml2

     

       80
       65
        
           libpng

     
···

       99
       84
        
           libsodium

     

       100
       85
        
           fmt

     

       101
       86
        
           freetype

     

       87
       87
       +
           premake5

     

       88
       88
       +
           cxxtest

     

       102
       89
        
         ] ++ lib.optional withEditor wxGTK;

     

       103
       90
        
       

     

       104
       91
        
         env.NIX_CFLAGS_COMPILE = toString [

     
···

       108
       95
        
           "-I${SDL2}/include/SDL2"

     

       109
       96
        
           "-I${fmt.dev}/include"

     

       110
       97
        
           "-I${nvidia-texture-tools.dev}/include"

     

       111
       111
       -
           # TODO: drop with next update

     

       112
       112
       -
           "-Wno-error=implicit-function-declaration"

     

       113
       98
        
         ];

     

       114
       99
        
       

     

       115
       100
        
         NIX_CFLAGS_LINK = toString [

     
···

       118
       103
        
       

     

       119
       104
        
         patches = [

     

       120
       105
        
           ./rootdir_env.patch

     

       121
       121
       -
       

     

       122
       122
       -
           # Fix build with libxml v2.12

     

       123
       123
       -
           # FIXME: Remove with next package update

     

       124
       124
       -
           (fetchpatch {

     

       125
       125
       -
             name = "libxml-2.12-fix.patch";

     

       126
       126
       -
             url = "https://github.com/0ad/0ad/commit/d242631245edb66816ef9960bdb2c61b68e56cec.patch";

     

       127
       127
       -
             hash = "sha256-Ik8ThkewB7wyTPTI7Y6k88SqpWUulXK698tevfSBr6I=";

     

       128
       128
       -
           })

     

       129
       129
       -
           # Fix build with GCC 13

     

       106
       106
       +
           # Fix build script when using system premake

     

       107
       107
       +
           # https://gitea.wildfiregames.com/0ad/0ad/pulls/7571

     

       130
       108
        
           # FIXME: Remove with next package update

     

       131
       131
       -
           (fetchpatch {

     

       132
       132
       -
             name = "gcc-13-fix.patch";

     

       133
       133
       -
             url = "https://github.com/0ad/0ad/commit/093e1eb23519ab4a4633a999a555a58e4fd5343e.patch";

     

       134
       134
       -
             hash = "sha256-NuWO64narU1JID/F3cj7lJKjo96XR7gSW0w8I3/hhuw=";

     

       135
       135
       -
           })

     

       136
       136
       -
           # Fix build with miniupnpc 2.2.8

     

       137
       137
       -
           # https://github.com/0ad/0ad/pull/45

     

       138
       138
       -
           (fetchpatch2 {

     

       139
       139
       -
             url = "https://github.com/0ad/0ad/commit/1575580bbc5278576693f3fbbb32de0b306aa27e.patch?full_index=1";

     

       140
       140
       -
             hash = "sha256-iXiUYTJCWwJpb2U3P58jTV4OpyW6quofu8Jq6xNEq48=";

     

       141
       141
       -
           })

     

       109
       109
       +
           ./fix-build-script.patch

     

       142
       110
        
         ];

     

       143
       111
        
       

     

       144
       112
        
         configurePhase = ''

     

       145
       113
        
           # Delete shipped libraries which we don't need.

     

       146
       146
       -
           rm -rf libraries/source/{enet,miniupnpc,nvtt,spidermonkey}

     

       114
       114
       +
           rm -rf libraries/source/{cxxtest-4.4,nvtt,premake-core,spidermonkey,spirv-reflect}

     

       115
       115
       +
       

     

       116
       116
       +
           # Build remaining library dependencies (should be fcollada only)

     

       117
       117
       +
           pushd libraries

     

       118
       118
       +
           ./build-source-libs.sh \

     

       119
       119
       +
             --with-system-cxxtest \

     

       120
       120
       +
             --with-system-nvtt \

     

       121
       121
       +
             --with-system-mozjs \

     

       122
       122
       +
             --with-system-premake \

     

       123
       123
       +
             -j$NIX_BUILD_CORES

     

       124
       124
       +
           popd

     

       147
       125
        
       

     

       148
       126
        
           # Update Makefiles

     

       149
       127
        
           pushd build/workspaces

     

       150
       128
        
           ./update-workspaces.sh \

     

       129
       129
       +
             --with-system-premake5 \

     

       130
       130
       +
             --with-system-cxxtest \

     

       151
       131
        
             --with-system-nvtt \

     

       152
       132
        
             --with-system-mozjs \

     

       153
       153
       -
             ${lib.optionalString withEditor "--enable-atlas"} \

     

       133
       133
       +
             ${lib.optionalString (!withEditor) "--without-atlas"} \

     

       154
       134
        
             --bindir="$out"/bin \

     

       155
       135
        
             --libdir="$out"/lib/0ad \

     

       156
       136
        
             --without-tests \

-15

pkgs/games/0ad/spidermonkey-cargo-toml.patch

···

       1
       1
       -
       diff --git a/Cargo.toml b/Cargo.toml

     

       2
       2
       -
       index 6f6199ab26..c3f92db9d8 100644

     

       3
       3
       -
       --- a/Cargo.toml

     

       4
       4
       -
       +++ b/Cargo.toml

     

       5
       5
       -
       @@ -68,8 +68,8 @@ panic = "abort"

     

       6
       6
       -
        libudev-sys = { path = "dom/webauthn/libudev-sys" }

     

       7
       7
       -
        packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="3541e3818fdc7c2a24f87e3459151a4ce955a67a" }

     

       8
       8
       -
        rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="d510da5999a744c563b0acd18056069d1698273f" }

     

       9
       9
       -
       -nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }

     

       10
       10
       -
       -spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3", rev = "20191ad2f370afd6d247edcb9ff9da32d3bedb9c" }

     

       11
       11
       -
       +nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1" }

     

       12
       12
       -
       +spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3" }

     

       13
       13
       -
        # failure's backtrace feature might break our builds, see bug 1608157.

     

       14
       14
       -
        failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }

     

       15
       15
       -
        failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }