about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2018-03-03 02:32:58 +0100
committerJan Tojnar <jtojnar@gmail.com>2018-03-04 20:05:51 +0100
commitc02794b6665db24975ea116858009d583c11beda (patch)
tree8651539d347089b8baabeec82c63c112ab7ac8f7
parent1a91396e1a19f57293ce9bf9820edabb7675173d (diff)
downloadnixlib-c02794b6665db24975ea116858009d583c11beda.tar
nixlib-c02794b6665db24975ea116858009d583c11beda.tar.gz
nixlib-c02794b6665db24975ea116858009d583c11beda.tar.bz2
nixlib-c02794b6665db24975ea116858009d583c11beda.tar.lz
nixlib-c02794b6665db24975ea116858009d583c11beda.tar.xz
nixlib-c02794b6665db24975ea116858009d583c11beda.tar.zst
nixlib-c02794b6665db24975ea116858009d583c11beda.zip
glib: add updateScript
-rw-r--r--pkgs/development/libraries/glib/default.nix14
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 5d60cf5e633a..e5163e933e13 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -1,5 +1,5 @@
 { stdenv, hostPlatform, fetchurl, pkgconfig, gettext, perl, python
-, libiconv, libintlOrEmpty, zlib, libffi, pcre, libelf
+, libiconv, libintlOrEmpty, zlib, libffi, pcre, libelf, gnome3
 # use utillinuxMinimal to avoid circular dependency (utillinux, systemd, glib)
 , utillinuxMinimal ? null
 
@@ -42,15 +42,14 @@ let
     ln -sr -t "''${!outputInclude}/include/" "''${!outputInclude}"/lib/*/include/* 2>/dev/null || true
   '';
 
-  ver_maj = "2.54";
-  ver_min = "3";
+  version = "2.54.3";
 in
 
 stdenv.mkDerivation rec {
-  name = "glib-${ver_maj}.${ver_min}";
+  name = "glib-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz";
+    url = "mirror://gnome/sources/glib/${gnome3.versionBranch version}/${name}.tar.xz";
     sha256 = "963fdc6685dc3da8e5381dfb9f15ca4b5709b28be84d9d05a9bb8e446abac0a8";
   };
 
@@ -143,8 +142,9 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-     gioModuleDir = "lib/gio/modules";
-     inherit flattenInclude;
+    gioModuleDir = "lib/gio/modules";
+    inherit flattenInclude;
+    updateScript = gnome3.updateScript { packageName = "glib"; };
   };
 
   meta = with stdenv.lib; {