diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 047d07aaae2..03a2f91c1fa 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -53,7 +53,7 @@ let ]; inherit (pkgs) atk glib gobjectIntrospection gtk2 webkitgtk gtk3 gtkmm3 libcanberra-gtk2 - libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf + libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview easytag meld orca rhythmbox shotwell clutter clutter-gst clutter-gtk cogl gtkvnc; @@ -174,8 +174,6 @@ let gsound = callPackage ./core/gsound { }; - gtksourceview = callPackage ./core/gtksourceview { }; - gtksourceviewmm = callPackage ./core/gtksourceviewmm { }; gucharmap = callPackage ./core/gucharmap { }; diff --git a/pkgs/desktops/gnome-3/core/gtksourceview/nix_share_path.patch b/pkgs/development/libraries/gtksourceview/3.x-nix_share_path.patch similarity index 100% rename from pkgs/desktops/gnome-3/core/gtksourceview/nix_share_path.patch rename to pkgs/development/libraries/gtksourceview/3.x-nix_share_path.patch diff --git a/pkgs/desktops/gnome-3/core/gtksourceview/default.nix b/pkgs/development/libraries/gtksourceview/3.x.nix similarity index 89% rename from pkgs/desktops/gnome-3/core/gtksourceview/default.nix rename to pkgs/development/libraries/gtksourceview/3.x.nix index a870b16f925..fd774039070 100644 --- a/pkgs/desktops/gnome-3/core/gtksourceview/default.nix +++ b/pkgs/development/libraries/gtksourceview/3.x.nix @@ -12,10 +12,6 @@ in stdenv.mkDerivation rec { sha256 = "7aa6bdfebcdc73a763dddeaa42f190c40835e6f8495bb9eb8f78587e2577c188"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gtksourceview"; attrPath = "gnome3.gtksourceview"; }; - }; - propagatedBuildInputs = [ # Required by gtksourceview-3.0.pc gtk3 @@ -34,7 +30,7 @@ in stdenv.mkDerivation rec { substituteInPlace gtksourceview/gtksourceview-utils.c --replace "@NIX_SHARE_PATH@" "$out/share" ''; - patches = [ ./nix_share_path.patch ]; + patches = [ ./3.x-nix_share_path.patch ]; enableParallelBuilding = true; @@ -46,6 +42,13 @@ in stdenv.mkDerivation rec { make check ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gtksourceview"; + attrPath = "gnome3.gtksourceview"; + }; + }; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/GtkSourceView; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a8ea973db07..1ed1b750c91 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9230,6 +9230,10 @@ with pkgs; gtk-mac-bundler = callPackage ../development/tools/gtk-mac-bundler {}; + gtksourceview = gtksourceview3; + + gtksourceview3 = callPackage ../development/libraries/gtksourceview/3.x.nix { }; + gtkspell2 = callPackage ../development/libraries/gtkspell { }; gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { };