From df89d4ce4100413e873ae05efae0b174ede83a6f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 25 Dec 2018 04:30:59 +0100
Subject: [PATCH] libpeas: rename from gnome3.libpeas

---
 pkgs/desktops/gnome-3/default.nix             |  4 +---
 .../libraries}/libpeas/default.nix            | 22 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  4 +++-
 3 files changed, 16 insertions(+), 14 deletions(-)
 rename pkgs/{desktops/gnome-3/core => development/libraries}/libpeas/default.nix (51%)

diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index a9cf9b7e9be..963275db1ed 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -38,7 +38,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3
     libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4
     easytag meld orca rhythmbox shotwell gnome-usage
-    clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco;
+    clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas;
 
   libsoup = pkgs.libsoup.override { gnomeSupport = true; };
   libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
@@ -163,8 +163,6 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   libgee = callPackage ./core/libgee { };
 
-  libpeas = callPackage ./core/libpeas {};
-
   libgweather = callPackage ./core/libgweather { };
 
   libzapojit = callPackage ./core/libzapojit { };
diff --git a/pkgs/desktops/gnome-3/core/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix
similarity index 51%
rename from pkgs/desktops/gnome-3/core/libpeas/default.nix
rename to pkgs/development/libraries/libpeas/default.nix
index fdbeb94c505..314d5884501 100644
--- a/pkgs/desktops/gnome-3/core/libpeas/default.nix
+++ b/pkgs/development/libraries/libpeas/default.nix
@@ -1,32 +1,34 @@
 { stdenv, fetchurl, pkgconfig, intltool, gnome3
-, glib, gtk3, gobject-introspection, python3Packages, ncurses
+, glib, gtk3, gobject-introspection, python3, ncurses
 }:
 
 stdenv.mkDerivation rec {
-  name = "libpeas-${version}";
+  pname = "libpeas";
   version = "1.22.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/libpeas/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "0qm908kisyjzjxvygdl18hjqxvvgkq9w0phs2g55pck277sw0bsv";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "libpeas"; attrPath = "gnome3.libpeas"; };
-  };
-
   configureFlags = [ "--enable-python3" ];
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs =  [ intltool glib gtk3 gnome3.defaultIconTheme ncurses python3Packages.python python3Packages.pygobject3 ];
+  nativeBuildInputs = [ pkgconfig intltool gobject-introspection ];
+  buildInputs =  [ glib gtk3 ncurses python3 python3.pkgs.pygobject3 ];
   propagatedBuildInputs = [
     # Required by libpeas-1.0.pc
     gobject-introspection
   ];
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+    };
+  };
+
   meta = with stdenv.lib; {
     description = "A GObject-based plugins engine";
-    homepage = http://ftp.acc.umu.se/pub/GNOME/sources/libpeas/;
+    homepage = https://wiki.gnome.org/Projects/Libpeas;
     license = licenses.gpl2Plus;
     platforms = platforms.unix;
     maintainers = gnome3.maintainers;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1ea64311c39..d2e2b0edc1b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11217,6 +11217,8 @@ in
 
   libpcap = callPackage ../development/libraries/libpcap { };
 
+  libpeas = callPackage ../development/libraries/libpeas { };
+
   libpipeline = callPackage ../development/libraries/libpipeline { };
 
   libpgf = callPackage ../development/libraries/libpgf { };
@@ -17933,7 +17935,7 @@ in
   libvmi = callPackage ../development/libraries/libvmi { };
 
   liferea = callPackage ../applications/networking/newsreaders/liferea {
-    inherit (gnome3) libpeas gsettings-desktop-schemas dconf;
+    inherit (gnome3) gsettings-desktop-schemas dconf;
   };
 
   lightworks = callPackage ../applications/video/lightworks {