diff options
author | worldofpeace <worldofpeace@users.noreply.github.com> | 2019-04-30 14:01:26 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-30 14:01:26 -0400 |
commit | bc757ff4f2b72a4545a39b7732c5a7179bd4b583 (patch) | |
tree | fd461ca14ca4779b4dbb2680598e30392e077fe6 | |
parent | 9d23245b74ffb05ba9d540a815292b5019370323 (diff) | |
parent | f1ad53b267902e378db433e7bb6b5aec65bfcf78 (diff) | |
download | nixlib-bc757ff4f2b72a4545a39b7732c5a7179bd4b583.tar nixlib-bc757ff4f2b72a4545a39b7732c5a7179bd4b583.tar.gz nixlib-bc757ff4f2b72a4545a39b7732c5a7179bd4b583.tar.bz2 nixlib-bc757ff4f2b72a4545a39b7732c5a7179bd4b583.tar.lz nixlib-bc757ff4f2b72a4545a39b7732c5a7179bd4b583.tar.xz nixlib-bc757ff4f2b72a4545a39b7732c5a7179bd4b583.tar.zst nixlib-bc757ff4f2b72a4545a39b7732c5a7179bd4b583.zip |
Merge pull request #59074 from dtzWill/update/libnotify-0.7.8
libnotify: 0.7.7 -> 0.7.8
-rw-r--r-- | pkgs/development/libraries/libnotify/default.nix | 39 |
1 files changed, 29 insertions, 10 deletions
diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix index d427f7decf8b..ddadb3cd97b6 100644 --- a/pkgs/development/libraries/libnotify/default.nix +++ b/pkgs/development/libraries/libnotify/default.nix @@ -1,22 +1,41 @@ -{ stdenv, fetchurl, pkgconfig, autoreconfHook -, glib, gdk_pixbuf, gobject-introspection }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, fetchpatch +, glib, gdk_pixbuf, gobject-introspection, gnome3 }: stdenv.mkDerivation rec { - ver_maj = "0.7"; - ver_min = "7"; - name = "libnotify-${ver_maj}.${ver_min}"; + pname = "libnotify"; + version = "0.7.8"; src = fetchurl { - url = "mirror://gnome/sources/libnotify/${ver_maj}/${name}.tar.xz"; - sha256 = "017wgq9n00hx39n0hm784zn18hl721hbaijda868cm96bcqwxd4w"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1371csx0n92g60b5dmai4mmzdnx8081mc3kcgc6a0xipcq5rw839"; }; - # disable tests as we don't need to depend on gtk+(2/3) - configureFlags = [ "--disable-tests" ]; + patches = [ + # Fix darwin build + # https://gitlab.gnome.org/GNOME/libnotify/merge_requests/9 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/libnotify/commit/55eb69247fe2b479ea43311503042fc03bf4e67d.patch"; + sha256 = "1hlb5b7c5axiyir1i5j2pi94bm2gyr1ybkp6yaqy7yk6iiqlvv50"; + }) + ]; - nativeBuildInputs = [ pkgconfig autoreconfHook gobject-introspection ]; + mesonFlags = [ + # disable tests as we don't need to depend on gtk+(2/3) + "-Dtests=false" + "-Ddocbook_docs=disabled" + "-Dgtk_doc=false" + ]; + + nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection ]; buildInputs = [ glib gdk_pixbuf ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + versionPolicy = "none"; + }; + }; + meta = with stdenv.lib; { homepage = https://developer.gnome.org/notification-spec/; description = "A library that sends desktop notifications to a notification daemon"; |