public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gtksourceviewmm: move from gnome3.gtksourceviewmm

Browse Source
This commit is contained in:
Jan Tojnar 2018-12-02 23:18:48 +01:00
parent f10f54b9c4
commit 3380db94b1
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/desktops/gnome-3/default.nix
View File

@ -36,7 +36,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 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; clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda;
@ -155,8 +155,6 @@ lib.makeScope pkgs.newScope (self: with self; {
gsound = callPackage ./core/gsound { }; gsound = callPackage ./core/gsound { };
gtksourceviewmm = callPackage ./core/gtksourceviewmm { };
gucharmap = callPackage ./core/gucharmap { }; gucharmap = callPackage ./core/gucharmap { };
gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; }; gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; };

4
pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix → pkgs/development/libraries/gtksourceviewmm/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gtkmm, glibmm, gtksourceview, gnome3 }: { stdenv, fetchurl, pkgconfig, gtkmm3, glibmm, gtksourceview3, gnome3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gtksourceviewmm-${version}"; name = "gtksourceviewmm-${version}";
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glibmm gtkmm gtksourceview ]; buildInputs = [ glibmm gtkmm3 gtksourceview3 ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
platforms = platforms.linux; platforms = platforms.linux;

2
pkgs/top-level/all-packages.nix
View File

@ -10221,6 +10221,8 @@ in
gtksourceview4 = callPackage ../development/libraries/gtksourceview/4.x.nix { }; gtksourceview4 = callPackage ../development/libraries/gtksourceview/4.x.nix { };
gtksourceviewmm = callPackage ../development/libraries/gtksourceviewmm { };
gtkspell2 = callPackage ../development/libraries/gtkspell { }; gtkspell2 = callPackage ../development/libraries/gtkspell { };
gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { }; gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { };