diff options
| author | Will Dietz <w@wdtz.org> | 2018-12-18 10:43:38 -0600 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-12-26 03:24:57 +0100 |
| commit | d030db0fc01fd847bda892d446bf57fdf4a90140 (patch) | |
| tree | 37f7bd26048f5ebfd5550eaf1ac12a616121920c /pkgs/development/libraries/glib/default.nix | |
| parent | b2e71e942d852943d010e5174320323b57d9357e (diff) | |
| download | nixpkgs-d030db0fc01fd847bda892d446bf57fdf4a90140.tar nixpkgs-d030db0fc01fd847bda892d446bf57fdf4a90140.tar.gz nixpkgs-d030db0fc01fd847bda892d446bf57fdf4a90140.tar.bz2 nixpkgs-d030db0fc01fd847bda892d446bf57fdf4a90140.tar.lz nixpkgs-d030db0fc01fd847bda892d446bf57fdf4a90140.tar.xz nixpkgs-d030db0fc01fd847bda892d446bf57fdf4a90140.tar.zst nixpkgs-d030db0fc01fd847bda892d446bf57fdf4a90140.zip | |
glib: 2.58.1 -> 2.58.2
Diffstat (limited to 'pkgs/development/libraries/glib/default.nix')
| -rw-r--r-- | pkgs/development/libraries/glib/default.nix | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 22acd530093..37275489cc3 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext, meson, ninja, pkgconfig, perl, python3, glibcLocales +{ stdenv, fetchurl, fetchpatch, gettext, meson, ninja, pkgconfig, perl, python3, glibcLocales , libiconv, zlib, libffi, pcre, libelf, gnome3, libselinux, bash, gnum4, gtk-doc, docbook_xsl, docbook_xml_dtd_45 # use utillinuxMinimal to avoid circular dependency (utillinux, systemd, glib) , utillinuxMinimal ? null @@ -44,7 +44,7 @@ let ln -sr -t "''${!outputInclude}/include/" "''${!outputInclude}"/lib/*/include/* 2>/dev/null || true ''; - version = "2.58.1"; + version = "2.58.2"; in stdenv.mkDerivation rec { @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1mnp4vankish8bqxymdl591p9v1ynk7pfc5dmpx3vamn4vcskmlp"; + sha256 = "0jrxfm4gn1qz3y1450z709v74ys2bkjr8yffkgy106kgagb4xcn7"; }; patches = optional stdenv.isDarwin ./darwin-compilation.patch @@ -64,6 +64,12 @@ stdenv.mkDerivation rec { ./schema-override-variable.patch # Require substituteInPlace in postPatch ./fix-gio-launch-desktop-path.patch + # https://gitlab.gnome.org/GNOME/glib/issues/1626 + # https://gitlab.gnome.org/GNOME/glib/merge_requests/557 + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/glib/commit/85c4031696add9797e2334ced20678edcd96c869.patch; + sha256 = "1hmyvhx89wip2a26gk1rvd87k0pjfia51s0ysybjyzf5f1pzw877"; + }) ]; outputs = [ "bin" "out" "dev" "devdoc" ]; |