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

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2018-07-19 18:24:24 +02:00
parent 9f208b5d8a e7e5aaa0b9
commit 8213ff161c
294 changed files with 61697 additions and 32101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/desktops/gnome-2/platform/GConf/default.nix
+4 -2
View File
@@ -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;
pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
+2 -2
View File
@@ -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
];