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

gtksourceview: move out of gnome3

Browse Source
This commit is contained in:
Jan Tojnar 2018-03-14 04:38:58 +01:00
parent 960d599f53
commit 08113f7ce7
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,7 +53,7 @@ let
]; ];
inherit (pkgs) atk glib gobjectIntrospection gtk2 webkitgtk gtk3 gtkmm3 libcanberra-gtk2 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 easytag meld orca rhythmbox shotwell
clutter clutter-gst clutter-gtk cogl gtkvnc; clutter clutter-gst clutter-gtk cogl gtkvnc;
@ -174,8 +174,6 @@ let
gsound = callPackage ./core/gsound { }; gsound = callPackage ./core/gsound { };
gtksourceview = callPackage ./core/gtksourceview { };
gtksourceviewmm = callPackage ./core/gtksourceviewmm { }; gtksourceviewmm = callPackage ./core/gtksourceviewmm { };
gucharmap = callPackage ./core/gucharmap { }; gucharmap = callPackage ./core/gucharmap { };

0
pkgs/desktops/gnome-3/core/gtksourceview/nix_share_path.patch → pkgs/development/libraries/gtksourceview/3.x-nix_share_path.patch
View File

13
pkgs/desktops/gnome-3/core/gtksourceview/default.nix → pkgs/development/libraries/gtksourceview/3.x.nix
View File

@ -12,10 +12,6 @@ in stdenv.mkDerivation rec {
sha256 = "7aa6bdfebcdc73a763dddeaa42f190c40835e6f8495bb9eb8f78587e2577c188"; sha256 = "7aa6bdfebcdc73a763dddeaa42f190c40835e6f8495bb9eb8f78587e2577c188";
}; };
passthru = {
updateScript = gnome3.updateScript { packageName = "gtksourceview"; attrPath = "gnome3.gtksourceview"; };
};
propagatedBuildInputs = [ propagatedBuildInputs = [
# Required by gtksourceview-3.0.pc # Required by gtksourceview-3.0.pc
gtk3 gtk3
@ -34,7 +30,7 @@ in stdenv.mkDerivation rec {
substituteInPlace gtksourceview/gtksourceview-utils.c --replace "@NIX_SHARE_PATH@" "$out/share" 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; enableParallelBuilding = true;
@ -46,6 +42,13 @@ in stdenv.mkDerivation rec {
make check make check
''; '';
passthru = {
updateScript = gnome3.updateScript {
packageName = "gtksourceview";
attrPath = "gnome3.gtksourceview";
};
};
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Projects/GtkSourceView; homepage = https://wiki.gnome.org/Projects/GtkSourceView;
platforms = with platforms; linux ++ darwin; platforms = with platforms; linux ++ darwin;

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

@ -9230,6 +9230,10 @@ with pkgs;
gtk-mac-bundler = callPackage ../development/tools/gtk-mac-bundler {}; gtk-mac-bundler = callPackage ../development/tools/gtk-mac-bundler {};
gtksourceview = gtksourceview3;
gtksourceview3 = callPackage ../development/libraries/gtksourceview/3.x.nix { };
gtkspell2 = callPackage ../development/libraries/gtkspell { }; gtkspell2 = callPackage ../development/libraries/gtkspell { };
gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { }; gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { };