Update dependencies

This commit is contained in:
Charlotte Van Petegem 2022-10-28 10:55:04 +02:00
parent 220421c5df
commit a92c58cda6
No known key found for this signature in database
GPG key ID: 019E764B7184435A
5 changed files with 43 additions and 94 deletions

View file

@ -1,26 +0,0 @@
From 036faba2adf7a9ca0e878b7fc7cafc5388edb527 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte.vanpetegem@ugent.be>
Date: Mon, 24 Oct 2022 09:28:30 +0200
Subject: [PATCH] zeroad: fix build
---
pkgs/games/0ad/game.nix | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix
index 488ef0c91e17f..7e1375a829f97 100644
--- a/pkgs/games/0ad/game.nix
+++ b/pkgs/games/0ad/game.nix
@@ -43,9 +43,9 @@ stdenv.mkDerivation rec {
] ++ lib.optional withEditor wxGTK;
NIX_CFLAGS_COMPILE = toString [
- "-I${xorgproto}/include/X11"
- "-I${libX11.dev}/include/X11"
- "-I${libXcursor.dev}/include/X11"
+ "-I${xorgproto}/include"
+ "-I${libX11.dev}/include"
+ "-I${libXcursor.dev}/include"
"-I${SDL2}/include/SDL2"
"-I${fmt.dev}/include"
"-I${nvidia-texture-tools.dev}/include"

View file

@ -1,30 +0,0 @@
From 30a57da8e0c34ad1821ebb3e0205dbeff15dac6d Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte.vanpetegem@ugent.be>
Date: Tue, 25 Oct 2022 09:32:04 +0200
Subject: [PATCH] mu: 1.8.10 -> 1.8.11
https://github.com/djcb/mu/releases/tag/v1.8.11
---
pkgs/tools/networking/mu/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix
index 6a578b4723988..0544b6d1ec116 100644
--- a/pkgs/tools/networking/mu/default.nix
+++ b/pkgs/tools/networking/mu/default.nix
@@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "mu";
- version = "1.8.10";
+ version = "1.8.11";
src = fetchFromGitHub {
owner = "djcb";
repo = "mu";
rev = "v${version}";
- hash = "sha256-hwroSuxn9zVjQBz8r2y93o42zzVkHWAZaEKKEVgSb5s=";
+ hash = "sha256-IEfwAAUqEGtN4vww0pfW7iuIY/U3eqzC+MJsqtossCw=";
};
postPatch = ''