diff options
| author | Will Dietz <w@wdtz.org> | 2019-01-20 01:15:00 -0600 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2019-01-20 01:21:17 -0600 |
| commit | 04f1e0098cd54390a9182ba2bb947b955c6b8baf (patch) | |
| tree | 3d1818035955cb737683aaa96eea44c2202f6fbd | |
| parent | d531da6f8ae7a8dab806bcd3211cd84d2d189d24 (diff) | |
| download | nixpkgs-04f1e0098cd54390a9182ba2bb947b955c6b8baf.tar nixpkgs-04f1e0098cd54390a9182ba2bb947b955c6b8baf.tar.gz nixpkgs-04f1e0098cd54390a9182ba2bb947b955c6b8baf.tar.bz2 nixpkgs-04f1e0098cd54390a9182ba2bb947b955c6b8baf.tar.lz nixpkgs-04f1e0098cd54390a9182ba2bb947b955c6b8baf.tar.xz nixpkgs-04f1e0098cd54390a9182ba2bb947b955c6b8baf.tar.zst nixpkgs-04f1e0098cd54390a9182ba2bb947b955c6b8baf.zip | |
glib: more "trash mount points" fixes from upstream
| -rw-r--r-- | pkgs/development/libraries/glib/default.nix | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 8bfca47a3b4..a6c757eacbb 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -75,6 +75,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" ]; |