diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-07-21 20:17:47 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-07-21 20:20:36 +0200 |
| commit | 452017032ac8af0c5e09d5abbf7a562ae524fea7 (patch) | |
| tree | a1e8ff07c6c777b0814fa4fce048c3946546e4a6 | |
| parent | ad47d658d1734353df834a05e45b98dae968550d (diff) | |
| download | nixlib-452017032ac8af0c5e09d5abbf7a562ae524fea7.tar nixlib-452017032ac8af0c5e09d5abbf7a562ae524fea7.tar.gz nixlib-452017032ac8af0c5e09d5abbf7a562ae524fea7.tar.bz2 nixlib-452017032ac8af0c5e09d5abbf7a562ae524fea7.tar.lz nixlib-452017032ac8af0c5e09d5abbf7a562ae524fea7.tar.xz nixlib-452017032ac8af0c5e09d5abbf7a562ae524fea7.tar.zst nixlib-452017032ac8af0c5e09d5abbf7a562ae524fea7.zip | |
fix Merge 8213ff161c461655aaff7d43984384dbca64b312
cc @FRidh
| -rw-r--r-- | pkgs/applications/misc/terminus/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-2/platform/GConf/default.nix | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/applications/misc/terminus/default.nix b/pkgs/applications/misc/terminus/default.nix index 2f7f90e580dc..c12a4c9f8da6 100644 --- a/pkgs/applications/misc/terminus/default.nix +++ b/pkgs/applications/misc/terminus/default.nix @@ -1,15 +1,14 @@ -{ stdenv, lib, fetchurl, dpkg, gnome3, gtk2, atk, glib, pango, gdk_pixbuf, cairo +{ stdenv, lib, fetchurl, dpkg, gnome2, gtk2, atk, glib, pango, gdk_pixbuf, cairo , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr , libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver , libxcb, makeWrapper, nodejs , nss, nspr, alsaLib, cups, expat, systemd, libpulseaudio }: -# FIXME: gnome3.gconf was unavailable when merging master into staging-next 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 nss nspr alsaLib cups expat systemd libpulseaudio + libXrender libX11 libXtst libXScrnSaver gnome2.GConf nss nspr alsaLib cups expat systemd libpulseaudio ]; in stdenv.mkDerivation rec { diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix index b37436e250be..afba6e15ebdd 100644 --- a/pkgs/desktops/gnome-2/platform/GConf/default.nix +++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, pkgconfig, dbus-glib, glib, ORBit2, libxml2 -, polkit, intltool, dbus, gtk2 ? null, withGtk ? false }: - +, polkit, intltool }: stdenv.mkDerivation rec { name = "gconf-${version}"; @@ -13,8 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" ]; - buildInputs = [ ORBit2 dbus dbus-glib libxml2 ] - + buildInputs = [ ORBit2 libxml2 ] # polkit requires pam, which requires shadow.h, which is not available on # darwin ++ stdenv.lib.optional (!stdenv.isDarwin) polkit; |