Update dependencies

This commit is contained in:
Charlotte Van Petegem 2024-01-18 14:52:14 +01:00
parent 4a9b623472
commit cc5cff77cf
No known key found for this signature in database
GPG key ID: 019E764B7184435A
2 changed files with 3 additions and 33 deletions

6
flake.lock generated
View file

@ -476,11 +476,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1705316053,
"narHash": "sha256-J2Ey5mPFT8gdfL2XC0JTZvKaBw/b2pnyudEXFvl+dQM=",
"lastModified": 1705496572,
"narHash": "sha256-rPIe9G5EBLXdBdn9ilGc0nq082lzQd0xGGe092R/5QE=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c3e128f3c0ecc1fb04aef9f72b3dcc2f6cecf370",
"rev": "842d9d80cfd4560648c785f8a4e6f3b096790e19",
"type": "github"
},
"original": {

View file

@ -1,30 +0,0 @@
diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix
index 1738c26659d22a..eadb8bd2745756 100644
--- a/pkgs/games/0ad/game.nix
+++ b/pkgs/games/0ad/game.nix
@@ -55,7 +55,24 @@ stdenv.mkDerivation rec {
"-L${nvidia-texture-tools.lib}/lib/static"
];
- patches = [ ./rootdir_env.patch ];
+ patches = [
+ ./rootdir_env.patch
+
+ # Fix build with libxml v2.12
+ # FIXME: Remove with next package update
+ (fetchpatch {
+ name = "libxml-2.12-fix.patch";
+ url = "https://github.com/0ad/0ad/commit/d242631245edb66816ef9960bdb2c61b68e56cec.patch";
+ hash = "sha256-Ik8ThkewB7wyTPTI7Y6k88SqpWUulXK698tevfSBr6I=";
+ })
+ # Fix build with GCC 13
+ # FIXME: Remove with next package update
+ (fetchpatch {
+ name = "gcc-13-fix.patch";
+ url = "https://github.com/0ad/0ad/commit/093e1eb23519ab4a4633a999a555a58e4fd5343e.patch";
+ hash = "sha256-NuWO64narU1JID/F3cj7lJKjo96XR7gSW0w8I3/hhuw=";
+ })
+ ];
configurePhase = ''
# Delete shipped libraries which we don't need.