libpeas: rename from gnome3.libpeas

This commit is contained in:
Jan Tojnar 2018-12-25 04:30:59 +01:00
parent 1ba8575f9a
commit df89d4ce41
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
3 changed files with 16 additions and 14 deletions

View File

@ -38,7 +38,7 @@ lib.makeScope pkgs.newScope (self: with self; {
inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3 inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3
libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4 libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4
easytag meld orca rhythmbox shotwell gnome-usage 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; }; libsoup = pkgs.libsoup.override { gnomeSupport = true; };
libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
@ -163,8 +163,6 @@ lib.makeScope pkgs.newScope (self: with self; {
libgee = callPackage ./core/libgee { }; libgee = callPackage ./core/libgee { };
libpeas = callPackage ./core/libpeas {};
libgweather = callPackage ./core/libgweather { }; libgweather = callPackage ./core/libgweather { };
libzapojit = callPackage ./core/libzapojit { }; libzapojit = callPackage ./core/libzapojit { };

View File

@ -1,32 +1,34 @@
{ stdenv, fetchurl, pkgconfig, intltool, gnome3 { stdenv, fetchurl, pkgconfig, intltool, gnome3
, glib, gtk3, gobject-introspection, python3Packages, ncurses , glib, gtk3, gobject-introspection, python3, ncurses
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libpeas-${version}"; pname = "libpeas";
version = "1.22.0"; version = "1.22.0";
src = fetchurl { 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"; sha256 = "0qm908kisyjzjxvygdl18hjqxvvgkq9w0phs2g55pck277sw0bsv";
}; };
passthru = {
updateScript = gnome3.updateScript { packageName = "libpeas"; attrPath = "gnome3.libpeas"; };
};
configureFlags = [ "--enable-python3" ]; configureFlags = [ "--enable-python3" ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig intltool gobject-introspection ];
buildInputs = [ intltool glib gtk3 gnome3.defaultIconTheme ncurses python3Packages.python python3Packages.pygobject3 ]; buildInputs = [ glib gtk3 ncurses python3 python3.pkgs.pygobject3 ];
propagatedBuildInputs = [ propagatedBuildInputs = [
# Required by libpeas-1.0.pc # Required by libpeas-1.0.pc
gobject-introspection gobject-introspection
]; ];
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
};
};
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A GObject-based plugins engine"; 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; license = licenses.gpl2Plus;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = gnome3.maintainers; maintainers = gnome3.maintainers;

View File

@ -11217,6 +11217,8 @@ in
libpcap = callPackage ../development/libraries/libpcap { }; libpcap = callPackage ../development/libraries/libpcap { };
libpeas = callPackage ../development/libraries/libpeas { };
libpipeline = callPackage ../development/libraries/libpipeline { }; libpipeline = callPackage ../development/libraries/libpipeline { };
libpgf = callPackage ../development/libraries/libpgf { }; libpgf = callPackage ../development/libraries/libpgf { };
@ -17933,7 +17935,7 @@ in
libvmi = callPackage ../development/libraries/libvmi { }; libvmi = callPackage ../development/libraries/libvmi { };
liferea = callPackage ../applications/networking/newsreaders/liferea { liferea = callPackage ../applications/networking/newsreaders/liferea {
inherit (gnome3) libpeas gsettings-desktop-schemas dconf; inherit (gnome3) gsettings-desktop-schemas dconf;
}; };
lightworks = callPackage ../applications/video/lightworks { lightworks = callPackage ../applications/video/lightworks {