hyper: gnome2 cleanup (#41170)

* hyper: gnome2 cleanup

* hyper: use toplevel gtk2
This commit is contained in:
worldofpeace 2018-05-29 19:35:43 +00:00 committed by xeji
parent e62b01b78e
commit 52b3f49797
2 changed files with 5 additions and 7 deletions

View File

@ -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 , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr
, libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver , libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver
, libxcb , libxcb, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }:
, GConf, 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 gnome3.gconf 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 nss nspr alsaLib cups expat libudev libpulseaudio
]; ];
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

View File

@ -16259,8 +16259,7 @@ with pkgs;
hydrogen = callPackage ../applications/audio/hydrogen { }; hydrogen = callPackage ../applications/audio/hydrogen { };
hyper = callPackage ../applications/misc/hyper { inherit (gnome2) GConf; }; hyper = callPackage ../applications/misc/hyper { };
hyperterm = self.hyper;
hyper-haskell-server-with-packages = callPackage ../development/tools/haskell/hyper-haskell/server.nix { hyper-haskell-server-with-packages = callPackage ../development/tools/haskell/hyper-haskell/server.nix {
inherit (haskellPackages) ghcWithPackages; inherit (haskellPackages) ghcWithPackages;