diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-11-07 15:51:51 -0800 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-11-07 15:51:51 -0800 |
| commit | a26c8e9b835647ae39d4259cfd55e8001ee57b93 (patch) | |
| tree | 55fe17fed5fc7625146a47e7f0e14b6581c18473 /pkgs/desktops/xfce | |
| parent | fa5ad20922cbc2b4ffbbb74edbc22d650d80441d (diff) | |
| parent | 9fd510e95ad8dd2d0e4c92f12fd9249594c30f23 (diff) | |
| download | nixlib-a26c8e9b835647ae39d4259cfd55e8001ee57b93.tar nixlib-a26c8e9b835647ae39d4259cfd55e8001ee57b93.tar.gz nixlib-a26c8e9b835647ae39d4259cfd55e8001ee57b93.tar.bz2 nixlib-a26c8e9b835647ae39d4259cfd55e8001ee57b93.tar.lz nixlib-a26c8e9b835647ae39d4259cfd55e8001ee57b93.tar.xz nixlib-a26c8e9b835647ae39d4259cfd55e8001ee57b93.tar.zst nixlib-a26c8e9b835647ae39d4259cfd55e8001ee57b93.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/desktops/xfce')
| -rw-r--r-- | pkgs/desktops/xfce/applications/mousepad.nix | 7 | ||||
| -rw-r--r-- | pkgs/desktops/xfce/default.nix | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/desktops/xfce/applications/mousepad.nix b/pkgs/desktops/xfce/applications/mousepad.nix index 4d6ac29f53d5..26f01e253c0d 100644 --- a/pkgs/desktops/xfce/applications/mousepad.nix +++ b/pkgs/desktops/xfce/applications/mousepad.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig, intltool, libxfce4util -, gtk, gtksourceview, dbus, dbus_glib, makeWrapper }: +, gtk, gtksourceview, dbus, dbus_glib, makeWrapper +, dconf }: stdenv.mkDerivation rec { p_name = "mousepad"; @@ -15,11 +16,13 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig intltool libxfce4util gtk gtksourceview dbus dbus_glib makeWrapper + dconf ]; preFixup = '' wrapProgram "$out/bin/mousepad" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:${gtksourceview}/share" + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:${gtksourceview}/share" \ + --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" ''; meta = { diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 2f563dbbf5ca..e83eb9737f6b 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -6,6 +6,7 @@ callPackage = newScope (deps // xfce_self); deps = { # xfce-global dependency overrides should be here inherit (pkgs.gnome) libglade libwnck vte gtksourceview; + inherit (pkgs.gnome3) dconf; inherit (pkgs.perlPackages) URI; }; |