JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix Merge 8213ff161c

Browse Source 
cc @FRidh
This commit is contained in:
Jan Tojnar 2018-07-21 20:17:47 +02:00
parent ad47d658d1
commit 452017032a
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/misc/terminus/default.nix
View File

@ -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 , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr
, libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver , libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver
, libxcb, makeWrapper, nodejs , libxcb, makeWrapper, nodejs
, nss, nspr, alsaLib, cups, expat, systemd, libpulseaudio }: , nss, nspr, alsaLib, cups, expat, systemd, libpulseaudio }:
# FIXME: gnome3.gconf was unavailable when merging master into staging-next
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 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 nss nspr alsaLib cups expat systemd libpulseaudio libXrender libX11 libXtst libXScrnSaver gnome2.GConf nss nspr alsaLib cups expat systemd libpulseaudio
]; ];
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

6
pkgs/desktops/gnome-2/platform/GConf/default.nix
View File

@ -1,6 +1,5 @@
{ stdenv, fetchurl, pkgconfig, dbus-glib, glib, ORBit2, libxml2 { stdenv, fetchurl, pkgconfig, dbus-glib, glib, ORBit2, libxml2
, polkit, intltool, dbus, gtk2 ? null, withGtk ? false }: , polkit, intltool }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gconf-${version}"; name = "gconf-${version}";
@ -13,8 +12,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "man" ]; 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 # polkit requires pam, which requires shadow.h, which is not available on
# darwin # darwin
++ stdenv.lib.optional (!stdenv.isDarwin) polkit; ++ stdenv.lib.optional (!stdenv.isDarwin) polkit;