diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 626f4652ece..29b48873e72 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -36,7 +36,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 gtksourceview4 + 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; @@ -155,8 +155,6 @@ lib.makeScope pkgs.newScope (self: with self; { gsound = callPackage ./core/gsound { }; - gtksourceviewmm = callPackage ./core/gtksourceviewmm { }; - gucharmap = callPackage ./core/gucharmap { }; gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; }; diff --git a/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix b/pkgs/development/libraries/gtksourceviewmm/default.nix similarity index 86% rename from pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix rename to pkgs/development/libraries/gtksourceviewmm/default.nix index 6a0ee7fb56a..455cc4d4b81 100644 --- a/pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix +++ b/pkgs/development/libraries/gtksourceviewmm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtkmm, glibmm, gtksourceview, gnome3 }: +{ stdenv, fetchurl, pkgconfig, gtkmm3, glibmm, gtksourceview3, gnome3 }: stdenv.mkDerivation rec { name = "gtksourceviewmm-${version}"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glibmm gtkmm gtksourceview ]; + buildInputs = [ glibmm gtkmm3 gtksourceview3 ]; meta = with stdenv.lib; { platforms = platforms.linux; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74be1ef73ec..32b56794c59 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10221,6 +10221,8 @@ in gtksourceview4 = callPackage ../development/libraries/gtksourceview/4.x.nix { }; + gtksourceviewmm = callPackage ../development/libraries/gtksourceviewmm { }; + gtkspell2 = callPackage ../development/libraries/gtkspell { }; gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { };