diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-04-01 15:50:50 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-04-01 15:50:50 +0000 |
| commit | 75eafe97f7df0d653bec67f3962214d7c357831f (patch) | |
| tree | 09f2cc901e0e637876cbb78d192dfe2fcfef8156 /nixpkgs/pkgs/development/libraries/libpeas | |
| parent | a53b121bf4331497da63df3b1b7f1a7897dad146 (diff) | |
| parent | a2e06fc3423c4be53181b15c28dfbe0bcf67dd73 (diff) | |
| download | nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.gz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.bz2 nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.lz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.xz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.zst nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.zip | |
Merge commit 'a2e06fc3423c4be53181b15c28dfbe0bcf67dd73'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libpeas')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libpeas/default.nix | 10 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libpeas/fix-libpeas-gtk-pc.patch | 22 |
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, - ) |