diff options
| author | Katharina Fey <kookie@spacekookie.de> | 2020-01-10 20:09:37 +0000 |
|---|---|---|
| committer | Katharina Fey <kookie@spacekookie.de> | 2020-01-10 20:09:37 +0000 |
| commit | 45431c078bf8f54aef7c9fae2e5913395ec82c31 (patch) | |
| tree | fd8ff1346a963ddd72e782421f05b623f9759e2a /nixpkgs/pkgs/development/libraries/glib/default.nix | |
| parent | c86fea6086c212ea489cfb023a5f5c9c8f188810 (diff) | |
| parent | 3ccbc8d89153ecf13f3eae7d9c106d91cd4ab9e5 (diff) | |
Merge commit '3ccbc8d89153ecf13f3eae7d9c106d91cd4ab9e5' into fuckthisshit
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/glib/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/glib/default.nix | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/development/libraries/glib/default.nix b/nixpkgs/pkgs/development/libraries/glib/default.nix index bbe503a67f3..494d0a61f06 100644 --- a/nixpkgs/pkgs/development/libraries/glib/default.nix +++ b/nixpkgs/pkgs/development/libraries/glib/default.nix @@ -48,21 +48,15 @@ in stdenv.mkDerivation rec { pname = "glib"; - version = "2.62.0"; + version = "2.62.2"; src = fetchurl { url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "046sqfmr84blxh4vkipmh8ff7wd19fxmh6lnr5ibchx3l02p49bc"; + sha256 = "1wdkvqq6fkk99smmnjg7d999v4qhbgs7halwfcwz0vgp2fj29239"; }; patches = optionals stdenv.isDarwin [ ./darwin-compilation.patch - # fix loading dylibs on darwin - # Remove on 2.62.1 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/glib/commit/e2409e5e180f1fa369d0e87e38e4d646d9f68791.patch"; - sha256 = "1dhjwlsqdgnn8fr8pzfrnd63m7pdgf7mizdyn8lwg17ggvq6qsqf"; - }) ] ++ optionals stdenv.hostPlatform.isMusl [ ./quark_init_on_demand.patch ./gobject_init_on_demand.patch @@ -194,6 +188,8 @@ stdenv.mkDerivation rec { inherit doCheck; + separateDebugInfo = stdenv.isLinux; + passthru = rec { gioModuleDir = "lib/gio/modules"; makeSchemaPath = dir: name: "${dir}/share/gsettings-schemas/${name}/glib-2.0/schemas"; @@ -206,7 +202,7 @@ stdenv.mkDerivation rec { description = "C library of programming buildings blocks"; homepage = https://www.gtk.org/; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ lovek323 raskin ]; + maintainers = with maintainers; [ lovek323 raskin worldofpeace ]; platforms = platforms.unix; longDescription = '' |