diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-19 18:24:24 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-19 18:24:24 +0200 |
| commit | 8213ff161c461655aaff7d43984384dbca64b312 (patch) | |
| tree | 3b7c3138ff2222b9b6b8d247c3b1a0c8ea3305e3 /pkgs/desktops/gnome-2 | |
| parent | 9f208b5d8aa10518eb92ed5b7d77e4a588b5154c (diff) | |
| parent | e7e5aaa0b938ed53dd96f58c8ebf9e0f7f72e133 (diff) | |
| download | nixpkgs-8213ff161c461655aaff7d43984384dbca64b312.tar nixpkgs-8213ff161c461655aaff7d43984384dbca64b312.tar.gz nixpkgs-8213ff161c461655aaff7d43984384dbca64b312.tar.bz2 nixpkgs-8213ff161c461655aaff7d43984384dbca64b312.tar.lz nixpkgs-8213ff161c461655aaff7d43984384dbca64b312.tar.xz nixpkgs-8213ff161c461655aaff7d43984384dbca64b312.tar.zst nixpkgs-8213ff161c461655aaff7d43984384dbca64b312.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/desktops/gnome-2')
| -rw-r--r-- | pkgs/desktops/gnome-2/platform/GConf/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix index afba6e15ebd..b37436e250b 100644 --- a/pkgs/desktops/gnome-2/platform/GConf/default.nix +++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig, dbus-glib, glib, ORBit2, libxml2 -, polkit, intltool }: +, polkit, intltool, dbus, gtk2 ? null, withGtk ? false }: + stdenv.mkDerivation rec { name = "gconf-${version}"; @@ -12,7 +13,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" ]; - buildInputs = [ ORBit2 libxml2 ] + buildInputs = [ ORBit2 dbus dbus-glib libxml2 ] + # polkit requires pam, which requires shadow.h, which is not available on # darwin ++ stdenv.lib.optional (!stdenv.isDarwin) polkit; diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix index 9d71b999d11..c15f43b542a 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libxml2, bzip2, openssl, dbus-glib -, glib, fam, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl }: +, glib, gamin, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl }: stdenv.mkDerivation rec { name = "gnome-vfs-${minVer}.4"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkgconfig ]; buildInputs = - [ libxml2 bzip2 openssl dbus-glib fam cdparanoia + [ libxml2 bzip2 openssl dbus-glib gamin cdparanoia gnome_mime_data avahi acl ]; |