mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 08:23:09 +00:00
hyper: gnome2 cleanup (#41170)
* hyper: gnome2 cleanup * hyper: use toplevel gtk2
This commit is contained in:
parent
e62b01b78e
commit
52b3f49797
@ -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 {
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user