From 848c1a72b2ab1912bce19d06a750920afbe99df4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 18 Aug 2015 23:02:35 +0200 Subject: [PATCH] gnome-control-center: don't add sounds to userEnv It's not needed after all. See discussion at https://github.com/NixOS/nixpkgs/pull/9308. --- .../gnome-3/3.16/core/gnome-control-center/default.nix | 4 ++-- 1 file 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 edd35202314..0f95f322d13 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