nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 23:13:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

vte, vte_290, vte-ng: rename frome gnome3.vte*

Browse Source
This commit is contained in:
worldofpeace 2018-12-25 18:15:46 -05:00
parent 0b14f7896d
commit 2c76519900
14 changed files with 38 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/editors/gnome-builder/default.nix
View File

@ -27,6 +27,7 @@
, sysprof , sysprof
, template-glib , template-glib
, vala , vala
, vte
, webkitgtk , webkitgtk
, wrapGAppsHook , wrapGAppsHook
}: }:
@ -64,7 +65,7 @@ in stdenv.mkDerivation {
gnome3.devhelp gnome3.devhelp
libgit2-glib libgit2-glib
gnome3.libpeas gnome3.libpeas
gnome3.vte vte
gspell gspell
gtk3 gtk3
gtksourceview4 gtksourceview4

4
pkgs/applications/misc/terminator/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, python2, keybinder3, intltool, file, gtk3, gobject-introspection { stdenv, fetchurl, python2, keybinder3, intltool, file, gtk3, gobject-introspection
, libnotify, wrapGAppsHook, gnome3 , libnotify, wrapGAppsHook, vte
}: }:
python2.pkgs.buildPythonApplication rec { python2.pkgs.buildPythonApplication rec {
@ -12,7 +12,7 @@ python2.pkgs.buildPythonApplication rec {
}; };
nativeBuildInputs = [ file intltool wrapGAppsHook gobject-introspection ]; nativeBuildInputs = [ file intltool wrapGAppsHook gobject-introspection ];
buildInputs = [ gtk3 gnome3.vte libnotify keybinder3 ]; buildInputs = [ gtk3 vte libnotify keybinder3 ];
propagatedBuildInputs = with python2.pkgs; [ pygobject3 psutil pycairo ]; propagatedBuildInputs = with python2.pkgs; [ pygobject3 psutil pycairo ];
postPatch = '' postPatch = ''

4
pkgs/applications/misc/termite/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig, vte, gtk3, ncurses, wrapGAppsHook }: { stdenv, fetchFromGitHub, pkgconfig, vte-ng, gtk3, ncurses, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "termite-${version}"; name = "termite-${version}";
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ]; makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ];
buildInputs = [ vte gtk3 ncurses ]; buildInputs = [ vte-ng gtk3 ncurses ];
nativeBuildInputs = [ wrapGAppsHook pkgconfig ]; nativeBuildInputs = [ wrapGAppsHook pkgconfig ];

4
pkgs/applications/virtualization/qemu/default.nix
View File

@ -8,7 +8,7 @@
, seccompSupport ? stdenv.isLinux, libseccomp , seccompSupport ? stdenv.isLinux, libseccomp
, pulseSupport ? !stdenv.isDarwin, libpulseaudio , pulseSupport ? !stdenv.isDarwin, libpulseaudio
, sdlSupport ? !stdenv.isDarwin, SDL2 , sdlSupport ? !stdenv.isDarwin, SDL2
, gtkSupport ? !stdenv.isDarwin && !xenSupport, gtk3, gettext, gnome3 , gtkSupport ? !stdenv.isDarwin && !xenSupport, gtk3, gettext, vte
, vncSupport ? true, libjpeg, libpng , vncSupport ? true, libjpeg, libpng
, smartcardSupport ? true, libcacard , smartcardSupport ? true, libcacard
, spiceSupport ? !stdenv.isDarwin, spice, spice-protocol , spiceSupport ? !stdenv.isDarwin, spice, spice-protocol
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
++ optionals numaSupport [ numactl ] ++ optionals numaSupport [ numactl ]
++ optionals pulseSupport [ libpulseaudio ] ++ optionals pulseSupport [ libpulseaudio ]
++ optionals sdlSupport [ SDL2 ] ++ optionals sdlSupport [ SDL2 ]
++ optionals gtkSupport [ gtk3 gettext gnome3.vte ] ++ optionals gtkSupport [ gtk3 gettext vte ]
++ optionals vncSupport [ libjpeg libpng ] ++ optionals vncSupport [ libjpeg libpng ]
++ optionals smartcardSupport [ libcacard ] ++ optionals smartcardSupport [ libcacard ]
++ optionals spiceSupport [ spice-protocol spice ] ++ optionals spiceSupport [ spice-protocol spice ]

2
pkgs/desktops/deepin/default.nix
View File

@ -23,7 +23,7 @@ let
deepin-shortcut-viewer = callPackage ./deepin-shortcut-viewer { }; deepin-shortcut-viewer = callPackage ./deepin-shortcut-viewer { };
deepin-sound-theme = callPackage ./deepin-sound-theme { }; deepin-sound-theme = callPackage ./deepin-sound-theme { };
deepin-terminal = callPackage ./deepin-terminal { deepin-terminal = callPackage ./deepin-terminal {
inherit (pkgs.gnome3) libgee vte; inherit (pkgs.gnome3) libgee;
wnck = pkgs.libwnck3; wnck = pkgs.libwnck3;
}; };
deepin-wallpapers = callPackage ./deepin-wallpapers { }; deepin-wallpapers = callPackage ./deepin-wallpapers { };

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

@ -38,7 +38,7 @@ lib.makeScope pkgs.newScope (self: with self; {
inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3 inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3
libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4 libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4
easytag meld orca rhythmbox shotwell gnome-usage 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; }; libsoup = pkgs.libsoup.override { gnomeSupport = true; };
libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
@ -201,12 +201,6 @@ lib.makeScope pkgs.newScope (self: with self; {
tracker-miners = callPackage ./core/tracker-miners { }; 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 { }; vino = callPackage ./core/vino { };
yelp = callPackage ./core/yelp { }; yelp = callPackage ./core/yelp { };

6
pkgs/desktops/mate/mate-terminal/default.nix
View File

@ -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 { stdenv.mkDerivation rec {
name = "mate-terminal-${version}"; name = "mate-terminal-${version}";
@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
mate.mate-desktop mate.mate-desktop
gnome3.vte vte
gnome3.gtk gtk3
gnome3.dconf gnome3.dconf
]; ];

2
pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix
View File

@ -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 { stdenv.mkDerivation rec {
majorVersion = "0.4"; majorVersion = "0.4";

4
pkgs/desktops/xfce4-13/default.nix
View File

@ -81,9 +81,7 @@ makeScope newScope (self: with self; {
xfce4-taskmanager = callPackage ./xfce4-taskmanager { }; xfce4-taskmanager = callPackage ./xfce4-taskmanager { };
xfce4-terminal = callPackage ./xfce4-terminal { xfce4-terminal = callPackage ./xfce4-terminal { };
inherit (gnome3) vte;
};
xfce4-volumed-pulse = callPackage ./xfce4-volumed-pulse { }; xfce4-volumed-pulse = callPackage ./xfce4-volumed-pulse { };

4
pkgs/development/libraries/gtkd/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchzip, atk, cairo, dmd, gdk_pixbuf, gnome3, gst_all_1, librsvg { stdenv, fetchzip, atk, cairo, dmd, gdk_pixbuf, gnome3, gst_all_1, librsvg
, pango, pkgconfig, which }: , pango, pkgconfig, which, vte }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gtkd-${version}"; name = "gtkd-${version}";
@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
dontStrip = true; dontStrip = true;
inherit atk cairo gdk_pixbuf librsvg pango; 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; inherit (gst_all_1) gstreamer;
gst_plugins_base = gst_all_1.gst-plugins-base; gst_plugins_base = gst_all_1.gst-plugins-base;

4
pkgs/desktops/gnome-3/core/vte/2.90.nix → pkgs/development/libraries/vte/2.90.nix
View File

@ -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 { stdenv.mkDerivation rec {
versionMajor = "0.36"; versionMajor = "0.36";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gobject-introspection intltool gnome3.glib gnome3.gtk3 ncurses ]; buildInputs = [ gobject-introspection intltool glib gtk3 ncurses ];
configureFlags = [ "--enable-introspection" ]; configureFlags = [ "--enable-introspection" ];

12
pkgs/desktops/gnome-3/core/vte/default.nix → pkgs/development/libraries/vte/default.nix
View File

@ -1,27 +1,27 @@
{ stdenv, fetchurl, intltool, pkgconfig { stdenv, fetchurl, intltool, pkgconfig
, gnome3, ncurses, gobject-introspection, vala, libxml2, gnutls , gnome3, glib, gtk3, ncurses, gobject-introspection, vala, libxml2, gnutls
, gperf, pcre2 , gperf, pcre2
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "vte-${version}"; pname = "vte";
version = "0.54.3"; version = "0.54.3";
src = fetchurl { 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"; sha256 = "1zgb8jgi6sr4km58zfml8zkm24qipbngl2h7s5razhi5a0a84dk9";
}; };
passthru = { passthru = {
updateScript = gnome3.updateScript { packageName = "vte"; attrPath = "gnome3.vte"; }; updateScript = gnome3.updateScript { packageName = pname; };
}; };
nativeBuildInputs = [ gobject-introspection intltool pkgconfig vala gperf libxml2 ]; nativeBuildInputs = [ gobject-introspection intltool pkgconfig vala gperf libxml2 ];
buildInputs = [ gnome3.glib gnome3.gtk3 ncurses ]; buildInputs = [ glib gtk3 ncurses ];
propagatedBuildInputs = [ propagatedBuildInputs = [
# Required by vte-2.91.pc. # Required by vte-2.91.pc.
gnome3.gtk3 gtk3
gnutls gnutls
pcre2 pcre2
]; ];

4
pkgs/desktops/gnome-3/core/vte/ng.nix → pkgs/development/libraries/vte/ng.nix
View File

@ -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}"; name = "vte-ng-${version}";
version = "0.50.2.a"; version = "0.50.2.a";

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

@ -12886,6 +12886,12 @@ in
vsqlite = callPackage ../development/libraries/vsqlite { }; 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 { vtk = callPackage ../development/libraries/vtk {
inherit (darwin) cf-private libobjc; inherit (darwin) cf-private libobjc;
inherit (darwin.apple_sdk.libs) xpc; inherit (darwin.apple_sdk.libs) xpc;
@ -17439,9 +17445,7 @@ in
inherit (gnome2) gtk; inherit (gnome2) gtk;
}; };
guake = callPackage ../applications/misc/guake { guake = callPackage ../applications/misc/guake { };
inherit (gnome3) vte;
};
guitone = callPackage ../applications/version-management/guitone { guitone = callPackage ../applications/version-management/guitone {
graphviz = graphviz_2_32; graphviz = graphviz_2_32;
@ -19114,9 +19118,7 @@ in
udiskie = python3Packages.callPackage ../applications/misc/udiskie { }; udiskie = python3Packages.callPackage ../applications/misc/udiskie { };
sakura = callPackage ../applications/misc/sakura { sakura = callPackage ../applications/misc/sakura { };
vte = gnome3.vte;
};
sayonara = callPackage ../applications/audio/sayonara { }; sayonara = callPackage ../applications/audio/sayonara { };
@ -19201,7 +19203,6 @@ in
ssvnc = callPackage ../applications/networking/remote/ssvnc { }; ssvnc = callPackage ../applications/networking/remote/ssvnc { };
stupidterm = callPackage ../applications/misc/stupidterm { stupidterm = callPackage ../applications/misc/stupidterm {
vte = gnome3.vte;
gtk = gtk3; gtk = gtk3;
}; };
@ -19504,18 +19505,14 @@ in
terminus = callPackage ../applications/misc/terminus { }; terminus = callPackage ../applications/misc/terminus { };
lxterminal = callPackage ../applications/misc/lxterminal { lxterminal = callPackage ../applications/misc/lxterminal { };
vte = gnome3.vte;
};
aminal = callPackage ../applications/misc/aminal { aminal = callPackage ../applications/misc/aminal {
inherit (darwin.apple_sdk.frameworks) Carbon Cocoa Kernel; inherit (darwin.apple_sdk.frameworks) Carbon Cocoa Kernel;
inherit (darwin) cf-private; inherit (darwin) cf-private;
}; };
termite-unwrapped = callPackage ../applications/misc/termite { termite-unwrapped = callPackage ../applications/misc/termite { };
vte = gnome3.vte-ng;
};
termite = callPackage ../applications/misc/termite/wrapper.nix { termite = termite-unwrapped; }; termite = callPackage ../applications/misc/termite/wrapper.nix { termite = termite-unwrapped; };
@ -19551,7 +19548,6 @@ in
tig = gitAndTools.tig; tig = gitAndTools.tig;
tilda = callPackage ../applications/misc/tilda { tilda = callPackage ../applications/misc/tilda {
vte = gnome3.vte;
gtk = gtk3; gtk = gtk3;
}; };
@ -19759,7 +19755,6 @@ in
virt-what = callPackage ../applications/virtualization/virt-what { }; virt-what = callPackage ../applications/virtualization/virt-what { };
virtmanager = callPackage ../applications/virtualization/virt-manager { virtmanager = callPackage ../applications/virtualization/virt-manager {
vte = gnome3.vte;
dconf = gnome3.dconf; dconf = gnome3.dconf;
system-libvirt = libvirt; system-libvirt = libvirt;
}; };
@ -20261,13 +20256,12 @@ in
xterm = callPackage ../applications/misc/xterm { }; xterm = callPackage ../applications/misc/xterm { };
mlterm = callPackage ../applications/misc/mlterm { mlterm = callPackage ../applications/misc/mlterm {
vte = gnome3.vte;
libssh2 = null; libssh2 = null;
openssl = null; openssl = null;
}; };
roxterm = callPackage ../applications/misc/roxterm { roxterm = callPackage ../applications/misc/roxterm {
inherit (gnome3) gsettings-desktop-schemas vte; inherit (gnome3) gsettings-desktop-schemas;
}; };
termonad-with-packages = callPackage ../applications/misc/termonad { termonad-with-packages = callPackage ../applications/misc/termonad {