about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/libraries/libpeas
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libpeas')
-rw-r--r--nixpkgs/pkgs/development/libraries/libpeas/default.nix10
-rw-r--r--nixpkgs/pkgs/development/libraries/libpeas/fix-libpeas-gtk-pc.patch22
2 files changed, 4 insertions, 28 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libpeas/default.nix b/nixpkgs/pkgs/development/libraries/libpeas/default.nix
index cdb1b95935f4..e73f98cd21dc 100644
--- a/nixpkgs/pkgs/development/libraries/libpeas/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libpeas/default.nix
@@ -4,11 +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 ];
@@ -18,10 +20,6 @@ stdenv.mkDerivation rec {
     gobject-introspection
   ];
 
-  patches = [
-    ./fix-libpeas-gtk-pc.patch
-  ];
-
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = pname;
diff --git a/nixpkgs/pkgs/development/libraries/libpeas/fix-libpeas-gtk-pc.patch b/nixpkgs/pkgs/development/libraries/libpeas/fix-libpeas-gtk-pc.patch
deleted file mode 100644
index 8016939716d9..000000000000
--- a/nixpkgs/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,
- )