diff options
| author | Oliver Charles <ollie@ocharles.org.uk> | 2014-07-01 08:43:50 +0100 |
|---|---|---|
| committer | Oliver Charles <ollie@ocharles.org.uk> | 2014-07-01 08:43:50 +0100 |
| commit | e11813c8fe0b043f900c80d274fdeaa45d12d06b (patch) | |
| tree | 39a4c51cd08ae2307ee34af13a6aaa2111ed24a8 | |
| parent | 37e8ebc456521429af40d555213ac3ced51fae04 (diff) | |
| parent | eb851b6a195bcb04a1756631faa3d88d16234c1a (diff) | |
Merge pull request #3142 from pSub/dwb-dconf-issue
Fixed dwb startup issue
| -rw-r--r-- | pkgs/applications/networking/browsers/dwb/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix index 87a548cbb3b7..3f490315515b 100644 --- a/pkgs/applications/networking/browsers/dwb/default.nix +++ b/pkgs/applications/networking/browsers/dwb/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, pkgconfig, makeWrapper, libsoup, webkit, gtk3, gnutls, json_c, - m4, glib_networking, gsettings_desktop_schemas }: + m4, glib_networking, gsettings_desktop_schemas, dconf }: stdenv.mkDerivation { name = "dwb-2014-06-17"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { preFixup='' wrapProgram "$out/bin/dwb" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ + --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules:${dconf}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" wrapProgram "$out/bin/dwbem" \ --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8cc1e36d8dd8..16cde13d5605 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8286,7 +8286,7 @@ let dvdauthor = callPackage ../applications/video/dvdauthor { }; - dwb = callPackage ../applications/networking/browsers/dwb { }; + dwb = callPackage ../applications/networking/browsers/dwb { dconf = gnome3.dconf; }; dwm = callPackage ../applications/window-managers/dwm { patches = config.dwm.patches or []; |