nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 07:53:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

glib: 2.58.1 -> 2.58.2

Browse Source
This commit is contained in:
Will Dietz 2018-12-18 10:43:38 -06:00 committed by Jan Tojnar
parent b2e71e942d
commit d030db0fc0
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/glib/default.nix
View File

@ -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 , 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) # use utillinuxMinimal to avoid circular dependency (utillinux, systemd, glib)
, utillinuxMinimal ? null , utillinuxMinimal ? null
@ -44,7 +44,7 @@ let
ln -sr -t "''${!outputInclude}/include/" "''${!outputInclude}"/lib/*/include/* 2>/dev/null || true ln -sr -t "''${!outputInclude}/include/" "''${!outputInclude}"/lib/*/include/* 2>/dev/null || true
''; '';
version = "2.58.1"; version = "2.58.2";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1mnp4vankish8bqxymdl591p9v1ynk7pfc5dmpx3vamn4vcskmlp"; sha256 = "0jrxfm4gn1qz3y1450z709v74ys2bkjr8yffkgy106kgagb4xcn7";
}; };
patches = optional stdenv.isDarwin ./darwin-compilation.patch patches = optional stdenv.isDarwin ./darwin-compilation.patch
@ -64,6 +64,12 @@ stdenv.mkDerivation rec {
./schema-override-variable.patch ./schema-override-variable.patch
# Require substituteInPlace in postPatch # Require substituteInPlace in postPatch
./fix-gio-launch-desktop-path.patch ./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" ]; outputs = [ "bin" "out" "dev" "devdoc" ];