diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-08-19 13:54:48 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-08-19 13:54:48 -0700 |
| commit | 901482ad999e2e4bc607012eee97057bd4c1c5df (patch) | |
| tree | 1b16b75e24fe3d65b7b730346100e7b9010ebd70 /pkgs/desktops | |
| parent | e91523aab59ae098343b3f68dfb0c45265868d80 (diff) | |
| parent | ef07bd04dca43a3ea5902a62d729cc2cc91999d1 (diff) | |
| download | nixlib-901482ad999e2e4bc607012eee97057bd4c1c5df.tar nixlib-901482ad999e2e4bc607012eee97057bd4c1c5df.tar.gz nixlib-901482ad999e2e4bc607012eee97057bd4c1c5df.tar.bz2 nixlib-901482ad999e2e4bc607012eee97057bd4c1c5df.tar.lz nixlib-901482ad999e2e4bc607012eee97057bd4c1c5df.tar.xz nixlib-901482ad999e2e4bc607012eee97057bd4c1c5df.tar.zst nixlib-901482ad999e2e4bc607012eee97057bd4c1c5df.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix index edd35202314a..0f95f322d13c 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; propagatedUserEnvPkgs = - [ gnome3.gnome_themes_standard gnome3.libgnomekbd sound-theme-freedesktop ]; + [ gnome3.gnome_themes_standard gnome3.libgnomekbd ]; # https://bugzilla.gnome.org/show_bug.cgi?id=752596 enableParallelBuilding = false; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { preFixup = with gnome3; '' wrapProgram $out/bin/gnome-control-center \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$out/share/gnome-control-center:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:${sound-theme-freedesktop}/share:$out/share:$out/share/gnome-control-center:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" for i in $out/share/applications/*; do substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center" done |