parent
ad47d658d1
commit
452017032a
|
@ -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 {
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue