From 090ee41e6bc1a0fae5c0e85ed213e9ae97211cc3 Mon Sep 17 00:00:00 2001 From: "ambrop7@gmail.com" Date: Sat, 29 Mar 2014 20:54:17 +0100 Subject: [PATCH] gvfs: Fix build with lightWeight=false (close #2068) Needed for SMB backend. --- pkgs/development/libraries/gvfs/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 083d0a10cdf..73b74a12c66 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -2,7 +2,7 @@ , glib, dbus, udev, udisks2, libgcrypt , libgphoto2, avahi, libarchive, fuse, libcdio , libxml2, libxslt, docbook_xsl -, lightWeight ? true, gnome, samba, makeWrapper }: +, lightWeight ? true, gnome, samba, libgnome_keyring, gconf, makeWrapper }: let ver_maj = "1.18"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da2edad1e60..fbc96e29d82 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4584,7 +4584,7 @@ let gts = callPackage ../development/libraries/gts { }; - gvfs = callPackage ../development/libraries/gvfs { }; + gvfs = callPackage ../development/libraries/gvfs { gconf = gnome.GConf; }; gwenhywfar = callPackage ../development/libraries/gwenhywfar { };