terminus: gnome2 cleanup (#41173)
* terminus: gnome2 cleanup * terminus: use toplevel gtk2
This commit is contained in:
parent
10e4e6a45f
commit
914994276b
|
@ -1,14 +1,14 @@
|
||||||
{ stdenv, lib, fetchurl, dpkg, gtk2, atk, glib, pango, gdk_pixbuf, cairo
|
{ stdenv, lib, fetchurl, dpkg, gnome3, gtk2, atk, glib, pango, gdk_pixbuf, cairo
|
||||||
, freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr
|
, freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr
|
||||||
, libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver
|
, libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver
|
||||||
, libxcb, makeWrapper, nodejs
|
, libxcb, makeWrapper, nodejs
|
||||||
, GConf, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }:
|
, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }:
|
||||||
|
|
||||||
let
|
let
|
||||||
libPath = stdenv.lib.makeLibraryPath [
|
libPath = stdenv.lib.makeLibraryPath [
|
||||||
stdenv.cc.cc gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
|
stdenv.cc.cc gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
|
||||||
libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb
|
libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb
|
||||||
libXrender libX11 libXtst libXScrnSaver GConf nss nspr alsaLib cups expat libudev libpulseaudio
|
libXrender libX11 libXtst libXScrnSaver gnome3.gconf nss nspr alsaLib cups expat libudev libpulseaudio
|
||||||
];
|
];
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
|
|
@ -18098,7 +18098,7 @@ with pkgs;
|
||||||
|
|
||||||
terminator = callPackage ../applications/misc/terminator { };
|
terminator = callPackage ../applications/misc/terminator { };
|
||||||
|
|
||||||
terminus = callPackage ../applications/misc/terminus { inherit (gnome2) GConf; };
|
terminus = callPackage ../applications/misc/terminus { };
|
||||||
|
|
||||||
lxterminal = callPackage ../applications/misc/lxterminal {
|
lxterminal = callPackage ../applications/misc/lxterminal {
|
||||||
vte = gnome3.vte;
|
vte = gnome3.vte;
|
||||||
|
|
Loading…
Reference in a new issue