about summary refs log tree commit diff
path: root/pkgs/development/libraries/glib
diff options
context:
space:
mode:
authorTor Hedin Brønner <torhedinbronner@gmail.com>2019-01-09 23:00:29 +0100
committerTor Hedin Brønner <torhedinbronner@gmail.com>2019-01-09 23:05:48 +0100
commit462a6d32501b204944a9ef3f04a6d28f28c36cbc (patch)
treed1c70a56038d3d052f4b2d20b8e8152225e44e55 /pkgs/development/libraries/glib
parentd9753c6e52069e6210e900f0a17a370e42d7dbc5 (diff)
downloadnixlib-462a6d32501b204944a9ef3f04a6d28f28c36cbc.tar
nixlib-462a6d32501b204944a9ef3f04a6d28f28c36cbc.tar.gz
nixlib-462a6d32501b204944a9ef3f04a6d28f28c36cbc.tar.bz2
nixlib-462a6d32501b204944a9ef3f04a6d28f28c36cbc.tar.lz
nixlib-462a6d32501b204944a9ef3f04a6d28f28c36cbc.tar.xz
nixlib-462a6d32501b204944a9ef3f04a6d28f28c36cbc.tar.zst
nixlib-462a6d32501b204944a9ef3f04a6d28f28c36cbc.zip
glib: fix libgio segfaults
In particular this fixes the libmediaart tests.

closes https://github.com/NixOS/nixpkgs/issues/53701
Diffstat (limited to 'pkgs/development/libraries/glib')
-rw-r--r--pkgs/development/libraries/glib/default.nix5
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 37275489cc3d..8bfca47a3b44 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -70,6 +70,11 @@ stdenv.mkDerivation rec {
         url = https://gitlab.gnome.org/GNOME/glib/commit/85c4031696add9797e2334ced20678edcd96c869.patch;
         sha256 = "1hmyvhx89wip2a26gk1rvd87k0pjfia51s0ysybjyzf5f1pzw877";
       })
+      # https://gitlab.gnome.org/GNOME/glib/issues/1645
+      (fetchpatch {
+        url = https://gitlab.gnome.org/GNOME/glib/commit/e695ca9f310c393d8f39694f77471dbcb06daa9e.diff;
+        sha256 = "1jkb2bdnni0xdyn86xrx9z0fdwxrm7y08lagz8x5x01wglkwa26w";
+      })
     ];
 
   outputs = [ "bin" "out" "dev" "devdoc" ];