diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/editors/gnome-builder/default.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/misc/terminator/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/termite/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/virtualization/qemu/default.nix | 4 | ||||
-rw-r--r-- | pkgs/desktops/deepin/default.nix | 2 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/default.nix | 8 | ||||
-rw-r--r-- | pkgs/desktops/mate/mate-terminal/default.nix | 6 | ||||
-rw-r--r-- | pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix | 2 | ||||
-rw-r--r-- | pkgs/desktops/xfce4-13/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/gtkd/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/vte/2.90.nix (renamed from pkgs/desktops/gnome-3/core/vte/2.90.nix) | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/vte/default.nix (renamed from pkgs/desktops/gnome-3/core/vte/default.nix) | 12 | ||||
-rw-r--r-- | pkgs/development/libraries/vte/ng.nix (renamed from pkgs/desktops/gnome-3/core/vte/ng.nix) | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 28 |
14 files changed, 38 insertions, 51 deletions
diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index a0357f3572f..8e0176797d2 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -27,6 +27,7 @@ , sysprof , template-glib , vala +, vte , webkitgtk , wrapGAppsHook }: @@ -64,7 +65,7 @@ in stdenv.mkDerivation { gnome3.devhelp libgit2-glib gnome3.libpeas - gnome3.vte + vte gspell gtk3 gtksourceview4 diff --git a/pkgs/applications/misc/terminator/default.nix b/pkgs/applications/misc/terminator/default.nix index f32a27b9b78..4a6ad4e5ea3 100644 --- a/pkgs/applications/misc/terminator/default.nix +++ b/pkgs/applications/misc/terminator/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python2, keybinder3, intltool, file, gtk3, gobject-introspection -, libnotify, wrapGAppsHook, gnome3 +, libnotify, wrapGAppsHook, vte }: python2.pkgs.buildPythonApplication rec { @@ -12,7 +12,7 @@ python2.pkgs.buildPythonApplication rec { }; nativeBuildInputs = [ file intltool wrapGAppsHook gobject-introspection ]; - buildInputs = [ gtk3 gnome3.vte libnotify keybinder3 ]; + buildInputs = [ gtk3 vte libnotify keybinder3 ]; propagatedBuildInputs = with python2.pkgs; [ pygobject3 psutil pycairo ]; postPatch = '' diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix index 957b5bc0e8d..22f669f0329 100644 --- a/pkgs/applications/misc/termite/default.nix +++ b/pkgs/applications/misc/termite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, vte, gtk3, ncurses, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, pkgconfig, vte-ng, gtk3, ncurses, wrapGAppsHook }: stdenv.mkDerivation rec { name = "termite-${version}"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ]; - buildInputs = [ vte gtk3 ncurses ]; + buildInputs = [ vte-ng gtk3 ncurses ]; nativeBuildInputs = [ wrapGAppsHook pkgconfig ]; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 49ddab1d6d2..86cf5352d6b 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -8,7 +8,7 @@ , seccompSupport ? stdenv.isLinux, libseccomp , pulseSupport ? !stdenv.isDarwin, libpulseaudio , sdlSupport ? !stdenv.isDarwin, SDL2 -, gtkSupport ? !stdenv.isDarwin && !xenSupport, gtk3, gettext, gnome3 +, gtkSupport ? !stdenv.isDarwin && !xenSupport, gtk3, gettext, vte , vncSupport ? true, libjpeg, libpng , smartcardSupport ? true, libcacard , spiceSupport ? !stdenv.isDarwin, spice, spice-protocol @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ++ optionals numaSupport [ numactl ] ++ optionals pulseSupport [ libpulseaudio ] ++ optionals sdlSupport [ SDL2 ] - ++ optionals gtkSupport [ gtk3 gettext gnome3.vte ] + ++ optionals gtkSupport [ gtk3 gettext vte ] ++ optionals vncSupport [ libjpeg libpng ] ++ optionals smartcardSupport [ libcacard ] ++ optionals spiceSupport [ spice-protocol spice ] diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 62a67c11492..4fe787bc5d4 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -23,7 +23,7 @@ let deepin-shortcut-viewer = callPackage ./deepin-shortcut-viewer { }; deepin-sound-theme = callPackage ./deepin-sound-theme { }; deepin-terminal = callPackage ./deepin-terminal { - inherit (pkgs.gnome3) libgee vte; + inherit (pkgs.gnome3) libgee; wnck = pkgs.libwnck3; }; deepin-wallpapers = callPackage ./deepin-wallpapers { }; diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index f030201927a..edf687c5d6b 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -38,7 +38,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 gtksourceviewmm gtksourceview4 easytag meld orca rhythmbox shotwell gnome-usage - clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd; + clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 vte-ng; libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; @@ -201,12 +201,6 @@ lib.makeScope pkgs.newScope (self: with self; { tracker-miners = callPackage ./core/tracker-miners { }; - vte = callPackage ./core/vte { }; - - vte_290 = callPackage ./core/vte/2.90.nix { }; - - vte-ng = callPackage ./core/vte/ng.nix { }; - vino = callPackage ./core/vino { }; yelp = callPackage ./core/yelp { }; diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix index a2f35284f4e..ce8f58cc99b 100644 --- a/pkgs/desktops/mate/mate-terminal/default.nix +++ b/pkgs/desktops/mate/mate-terminal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, gnome3, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, gnome3, gtk3, vte, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-terminal-${version}"; @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { mate.mate-desktop - gnome3.vte - gnome3.gtk + vte + gtk3 gnome3.dconf ]; diff --git a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix index 95d371959e5..d6bc8f5330b 100644 --- a/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, cmake, vala_0_38, pkgconfig, glib, gtk3, granite, gnome3, libnotify, gettext, wrapGAppsHook, gobject-introspection }: +{ stdenv, fetchurl, perl, cmake, vala_0_38, pkgconfig, glib, gtk3, granite, gnome3, vte_290, libnotify, gettext, wrapGAppsHook, gobject-introspection }: stdenv.mkDerivation rec { majorVersion = "0.4"; diff --git a/pkgs/desktops/xfce4-13/default.nix b/pkgs/desktops/xfce4-13/default.nix index 4809cec839a..d3e46cf2365 100644 --- a/pkgs/desktops/xfce4-13/default.nix +++ b/pkgs/desktops/xfce4-13/default.nix @@ -81,9 +81,7 @@ makeScope newScope (self: with self; { xfce4-taskmanager = callPackage ./xfce4-taskmanager { }; - xfce4-terminal = callPackage ./xfce4-terminal { - inherit (gnome3) vte; - }; + xfce4-terminal = callPackage ./xfce4-terminal { }; xfce4-volumed-pulse = callPackage ./xfce4-volumed-pulse { }; diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix index 66ba526f08e..780b00f9d9a 100644 --- a/pkgs/development/libraries/gtkd/default.nix +++ b/pkgs/development/libraries/gtkd/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchzip, atk, cairo, dmd, gdk_pixbuf, gnome3, gst_all_1, librsvg -, pango, pkgconfig, which }: +, pango, pkgconfig, which, vte }: stdenv.mkDerivation rec { name = "gtkd-${version}"; @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { dontStrip = true; inherit atk cairo gdk_pixbuf librsvg pango; - inherit (gnome3) glib gtk3 gtksourceview libgda libpeas vte; + inherit (gnome3) glib gtk3 gtksourceview libgda libpeas; inherit (gst_all_1) gstreamer; gst_plugins_base = gst_all_1.gst-plugins-base; diff --git a/pkgs/desktops/gnome-3/core/vte/2.90.nix b/pkgs/development/libraries/vte/2.90.nix index 52bf198f29c..4b2b74c5e1d 100644 --- a/pkgs/desktops/gnome-3/core/vte/2.90.nix +++ b/pkgs/development/libraries/vte/2.90.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses, gobject-introspection }: +{ stdenv, fetchurl, intltool, pkgconfig, gnome3, glib, gtk3, ncurses, gobject-introspection }: stdenv.mkDerivation rec { versionMajor = "0.36"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gobject-introspection intltool gnome3.glib gnome3.gtk3 ncurses ]; + buildInputs = [ gobject-introspection intltool glib gtk3 ncurses ]; configureFlags = [ "--enable-introspection" ]; diff --git a/pkgs/desktops/gnome-3/core/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 904bdd323d8..97bb961c4bc 100644 --- a/pkgs/desktops/gnome-3/core/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -1,27 +1,27 @@ { stdenv, fetchurl, intltool, pkgconfig -, gnome3, ncurses, gobject-introspection, vala, libxml2, gnutls +, gnome3, glib, gtk3, ncurses, gobject-introspection, vala, libxml2, gnutls , gperf, pcre2 }: stdenv.mkDerivation rec { - name = "vte-${version}"; + pname = "vte"; version = "0.54.3"; src = fetchurl { - url = "mirror://gnome/sources/vte/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1zgb8jgi6sr4km58zfml8zkm24qipbngl2h7s5razhi5a0a84dk9"; }; passthru = { - updateScript = gnome3.updateScript { packageName = "vte"; attrPath = "gnome3.vte"; }; + updateScript = gnome3.updateScript { packageName = pname; }; }; nativeBuildInputs = [ gobject-introspection intltool pkgconfig vala gperf libxml2 ]; - buildInputs = [ gnome3.glib gnome3.gtk3 ncurses ]; + buildInputs = [ glib gtk3 ncurses ]; propagatedBuildInputs = [ # Required by vte-2.91.pc. - gnome3.gtk3 + gtk3 gnutls pcre2 ]; diff --git a/pkgs/desktops/gnome-3/core/vte/ng.nix b/pkgs/development/libraries/vte/ng.nix index e6dc005fe58..3aee9e9dcdf 100644 --- a/pkgs/desktops/gnome-3/core/vte/ng.nix +++ b/pkgs/development/libraries/vte/ng.nix @@ -1,6 +1,6 @@ -{ gnome3, fetchFromGitHub, autoconf, automake, gtk-doc, gettext, libtool, gperf }: +{ vte, fetchFromGitHub, autoconf, automake, gtk-doc, gettext, libtool, gperf }: -gnome3.vte.overrideAttrs (oldAttrs: rec { +vte.overrideAttrs (oldAttrs: rec { name = "vte-ng-${version}"; version = "0.50.2.a"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac3301060f0..19c28e749dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12886,6 +12886,12 @@ in vsqlite = callPackage ../development/libraries/vsqlite { }; + vte = callPackage ../development/libraries/vte { }; + + vte_290 = callPackage ../development/libraries/vte/2.90.nix { }; + + vte-ng = callPackage ../development/libraries/vte/ng.nix { }; + vtk = callPackage ../development/libraries/vtk { inherit (darwin) cf-private libobjc; inherit (darwin.apple_sdk.libs) xpc; @@ -17439,9 +17445,7 @@ in inherit (gnome2) gtk; }; - guake = callPackage ../applications/misc/guake { - inherit (gnome3) vte; - }; + guake = callPackage ../applications/misc/guake { }; guitone = callPackage ../applications/version-management/guitone { graphviz = graphviz_2_32; @@ -19114,9 +19118,7 @@ in udiskie = python3Packages.callPackage ../applications/misc/udiskie { }; - sakura = callPackage ../applications/misc/sakura { - vte = gnome3.vte; - }; + sakura = callPackage ../applications/misc/sakura { }; sayonara = callPackage ../applications/audio/sayonara { }; @@ -19201,7 +19203,6 @@ in ssvnc = callPackage ../applications/networking/remote/ssvnc { }; stupidterm = callPackage ../applications/misc/stupidterm { - vte = gnome3.vte; gtk = gtk3; }; @@ -19504,18 +19505,14 @@ in terminus = callPackage ../applications/misc/terminus { }; - lxterminal = callPackage ../applications/misc/lxterminal { - vte = gnome3.vte; - }; + lxterminal = callPackage ../applications/misc/lxterminal { }; aminal = callPackage ../applications/misc/aminal { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa Kernel; inherit (darwin) cf-private; }; - termite-unwrapped = callPackage ../applications/misc/termite { - vte = gnome3.vte-ng; - }; + termite-unwrapped = callPackage ../applications/misc/termite { }; termite = callPackage ../applications/misc/termite/wrapper.nix { termite = termite-unwrapped; }; @@ -19551,7 +19548,6 @@ in tig = gitAndTools.tig; tilda = callPackage ../applications/misc/tilda { - vte = gnome3.vte; gtk = gtk3; }; @@ -19759,7 +19755,6 @@ in virt-what = callPackage ../applications/virtualization/virt-what { }; virtmanager = callPackage ../applications/virtualization/virt-manager { - vte = gnome3.vte; dconf = gnome3.dconf; system-libvirt = libvirt; }; @@ -20261,13 +20256,12 @@ in xterm = callPackage ../applications/misc/xterm { }; mlterm = callPackage ../applications/misc/mlterm { - vte = gnome3.vte; libssh2 = null; openssl = null; }; roxterm = callPackage ../applications/misc/roxterm { - inherit (gnome3) gsettings-desktop-schemas vte; + inherit (gnome3) gsettings-desktop-schemas; }; termonad-with-packages = callPackage ../applications/misc/termonad { |