mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 21:21:06 +00:00
Code Issues Wiki Activity

Merge pull request #3142 from pSub/dwb-dconf-issue

Browse source 
Fixed dwb startup issue
This commit is contained in:
Oliver Charles 2014-07-01 08:43:50 +01:00
parent 37e8ebc456 eb851b6a19
commit e11813c8fe
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/networking/browsers/dwb/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchgit, pkgconfig, makeWrapper, libsoup, webkit, gtk3, gnutls, json_c, { 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 { stdenv.mkDerivation {
name = "dwb-2014-06-17"; name = "dwb-2014-06-17";
@ -19,7 +19,7 @@ stdenv.mkDerivation {
preFixup='' preFixup=''
wrapProgram "$out/bin/dwb" \ 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" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share"
wrapProgram "$out/bin/dwbem" \ wrapProgram "$out/bin/dwbem" \
--prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules"

2
pkgs/top-level/all-packages.nix
View file

@ -8286,7 +8286,7 @@ let
dvdauthor = callPackage ../applications/video/dvdauthor { }; 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 { dwm = callPackage ../applications/window-managers/dwm {
patches = config.dwm.patches or []; patches = config.dwm.patches or [];