From 914994276bc942cefb11804ff3d44e75d7ee168f Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 30 May 2018 07:20:22 +0000 Subject: [PATCH] terminus: gnome2 cleanup (#41173) * terminus: gnome2 cleanup * terminus: use toplevel gtk2 --- pkgs/applications/misc/terminus/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/terminus/default.nix b/pkgs/applications/misc/terminus/default.nix index 67ca05fdb10f..d2a2936680f9 100644 --- a/pkgs/applications/misc/terminus/default.nix +++ b/pkgs/applications/misc/terminus/default.nix @@ -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 , libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver , libxcb, makeWrapper, nodejs -, GConf, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }: +, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }: let libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus 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 stdenv.mkDerivation rec { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 36779a377534..b7e449ffdf12 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18098,7 +18098,7 @@ with pkgs; terminator = callPackage ../applications/misc/terminator { }; - terminus = callPackage ../applications/misc/terminus { inherit (gnome2) GConf; }; + terminus = callPackage ../applications/misc/terminus { }; lxterminal = callPackage ../applications/misc/lxterminal { vte = gnome3.vte;