diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-12-02 23:18:48 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-12-18 00:46:55 +0100 |
| commit | 3380db94b1c04158bdc66944c4fa36d074aae157 (patch) | |
| tree | a4b7516e4e8ba8188f563f5cefc15b026cbe32c9 /pkgs | |
| parent | f10f54b9c474317b5e3a5e7669e8af167894a07b (diff) | |
| download | nixpkgs-3380db94b1c04158bdc66944c4fa36d074aae157.tar nixpkgs-3380db94b1c04158bdc66944c4fa36d074aae157.tar.gz nixpkgs-3380db94b1c04158bdc66944c4fa36d074aae157.tar.bz2 nixpkgs-3380db94b1c04158bdc66944c4fa36d074aae157.tar.lz nixpkgs-3380db94b1c04158bdc66944c4fa36d074aae157.tar.xz nixpkgs-3380db94b1c04158bdc66944c4fa36d074aae157.tar.zst nixpkgs-3380db94b1c04158bdc66944c4fa36d074aae157.zip | |
gtksourceviewmm: move from gnome3.gtksourceviewmm
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/desktops/gnome-3/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/gtksourceviewmm/default.nix (renamed from pkgs/desktops/gnome-3/core/gtksourceviewmm/default.nix) | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 5 insertions, 5 deletions
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 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 { }; |