diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-02-24 01:09:00 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-02-24 01:09:00 +0000 |
| commit | 072c01a28f865e9487df09aed7ddff328252fb36 (patch) | |
| tree | 6df6e652915940255f294ed8998cce1c4c7c2d40 /nixpkgs/pkgs/development/libraries/glib | |
| parent | 024b46ff20027c15322e5d868ecec42632556d4b (diff) | |
| parent | 969cff2691a02b3d7e5468beda26c482d8986644 (diff) | |
| download | nixlib-072c01a28f865e9487df09aed7ddff328252fb36.tar nixlib-072c01a28f865e9487df09aed7ddff328252fb36.tar.gz nixlib-072c01a28f865e9487df09aed7ddff328252fb36.tar.bz2 nixlib-072c01a28f865e9487df09aed7ddff328252fb36.tar.lz nixlib-072c01a28f865e9487df09aed7ddff328252fb36.tar.xz nixlib-072c01a28f865e9487df09aed7ddff328252fb36.tar.zst nixlib-072c01a28f865e9487df09aed7ddff328252fb36.zip | |
Merge commit '969cff2691a02b3d7e5468beda26c482d8986644'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/glib')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/glib/default.nix | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/libraries/glib/default.nix b/nixpkgs/pkgs/development/libraries/glib/default.nix index 62963283f937..e0255be666e9 100644 --- a/nixpkgs/pkgs/development/libraries/glib/default.nix +++ b/nixpkgs/pkgs/development/libraries/glib/default.nix @@ -77,6 +77,15 @@ stdenv.mkDerivation rec { url = https://gitlab.gnome.org/GNOME/glib/commit/e695ca9f310c393d8f39694f77471dbcb06daa9e.diff; sha256 = "1jkb2bdnni0xdyn86xrx9z0fdwxrm7y08lagz8x5x01wglkwa26w"; }) + # https://gitlab.gnome.org/GNOME/glib/issues/1643 + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/glib/commit/c792e5adaa8ae3a45e6ff3ff71168ad8d040a0d4.patch; + sha256 = "022x70qfn5wlv5gz3nlg0bwiwjxcd7l11j3qvbms2y8d1ffh5rfd"; + }) + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/glib/commit/30ccbc386026cecac6ef3a77d8fa4f3c24ac68d7.patch; + sha256 = "04y3pxgzlx92cppwibx4rlsyvwxb37aq52x2lr6ajfgykv2nzpr3"; + }) ]; outputs = [ "bin" "out" "dev" "devdoc" ]; |