From 52b3f49797d5c1963eef534074d145b3beb47e75 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 29 May 2018 19:35:43 +0000 Subject: [PATCH] hyper: gnome2 cleanup (#41170) * hyper: gnome2 cleanup * hyper: use toplevel gtk2 --- pkgs/applications/misc/hyper/default.nix | 9 ++++----- pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/hyper/default.nix b/pkgs/applications/misc/hyper/default.nix index 75d18c7a774d..65b85868bc59 100644 --- a/pkgs/applications/misc/hyper/default.nix +++ b/pkgs/applications/misc/hyper/default.nix @@ -1,14 +1,13 @@ -{ stdenv, lib, fetchurl, dpkg, gtk2, atk, glib, pango, gdk_pixbuf, cairo +{ stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk_pixbuf, gnome3, gtk2, cairo , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr , libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver -, libxcb -, GConf, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }: +, libxcb, 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 + stdenv.cc.cc gtk2 gnome3.gconf 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 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 741b7b55fe2b..f4dcd0314066 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16259,8 +16259,7 @@ with pkgs; hydrogen = callPackage ../applications/audio/hydrogen { }; - hyper = callPackage ../applications/misc/hyper { inherit (gnome2) GConf; }; - hyperterm = self.hyper; + hyper = callPackage ../applications/misc/hyper { }; hyper-haskell-server-with-packages = callPackage ../development/tools/haskell/hyper-haskell/server.nix { inherit (haskellPackages) ghcWithPackages;