From 8bf3b33cf232e3babe07d4f7b5d4ee6bcdcd2512 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 19 Feb 2020 21:08:16 -0500 Subject: libpeas: 1.24.0 -> 1.24.1 --- pkgs/development/libraries/libpeas/default.nix | 8 ++------ .../libraries/libpeas/fix-libpeas-gtk-pc.patch | 22 ---------------------- 2 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 pkgs/development/libraries/libpeas/fix-libpeas-gtk-pc.patch (limited to 'pkgs/development/libraries/libpeas') diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix index a4632924a93ad..e73f98cd21dc6 100644 --- a/pkgs/development/libraries/libpeas/default.nix +++ b/pkgs/development/libraries/libpeas/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libpeas"; - version = "1.24.0"; + version = "1.24.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1yg6r0srz3knhgvplprl3pikrq5c02dmdxgfwcynd6hjih9h16hb"; + sha256 = "1162dr7smmfb02czmhshr0f93hqj7w0nw29bys5lzfvwarxcyflw"; }; nativeBuildInputs = [ pkgconfig meson ninja gettext gobject-introspection ]; @@ -20,10 +20,6 @@ stdenv.mkDerivation rec { gobject-introspection ]; - patches = [ - ./fix-libpeas-gtk-pc.patch - ]; - passthru = { updateScript = gnome3.updateScript { packageName = pname; diff --git a/pkgs/development/libraries/libpeas/fix-libpeas-gtk-pc.patch b/pkgs/development/libraries/libpeas/fix-libpeas-gtk-pc.patch deleted file mode 100644 index 8016939716d9b..0000000000000 --- a/pkgs/development/libraries/libpeas/fix-libpeas-gtk-pc.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/libpeas-gtk/meson.build b/libpeas-gtk/meson.build -index bf590de..00def42 100644 ---- a/libpeas-gtk/meson.build -+++ b/libpeas-gtk/meson.build -@@ -111,10 +111,17 @@ libpeas_gtk_test_dep = declare_dependency( - sources: libpeas_gtk_dep_sources, - ) - -+libpeas_gtk_pc_reqs = [ -+ glib_dep, -+ gtk_dep, -+ package_string + ' >= @0@'.format(version) -+] -+ - libpeas_gtk_pc = pkg.generate( - libpeas_gtk_sha, - name: package_gtk_string, - description: 'GObject plugins library widgetery', -+ requires: libpeas_gtk_pc_reqs, - subdirs: package_string, - install_dir: pkgconfigdir, - ) -- cgit 1.4.1