aboutsummaryrefslogtreecommitdiff
path: root/pkgs/development/libraries/glib
diff options
context:
space:
mode:
authorPiotr Bogdan <ppbogdan@gmail.com>2020-09-21 17:55:03 +0100
committerJan Tojnar <jtojnar@gmail.com>2020-10-24 01:17:00 +0200
commitde1af76f0dec274f504829e116daeeb7f394b7cf (patch)
tree4cb5ee1bff70c94a5a4fce1334874026f71b29c7 /pkgs/development/libraries/glib
parentc87e6738df0283d87a17e0af7c1105bd030c754b (diff)
glib: Fix tests on some FSs
By applying https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1648
Diffstat (limited to 'pkgs/development/libraries/glib')
-rw-r--r--pkgs/development/libraries/glib/default.nix6
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 797547cadd22..d719c5037df6 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -83,6 +83,12 @@ stdenv.mkDerivation rec {
# 3. Tools for desktop environment that cannot go to $bin due to $out depending on them ($out)
# * gio-launch-desktop
./split-dev-programs.patch
+
+ # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1648
+ (fetchpatch {
+ url = "https://gitlab.gnome.org/GNOME/glib/-/commit/642baa50fa561f7abfbbfe5ac9a10351a706b95a.patch";
+ sha256 = "0mrin6x6iy9x2bplz6q7ljdq677nmvcwhns7nkahj719h0qpzn0z";
+ })
] ++ optional doCheck ./skip-timer-test.patch;
outputs = [ "bin" "out" "dev" "devdoc" ];