From 546e511edc1de7ab193ac243f4a98d389aa43524 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Thu, 13 Sep 2018 17:41:06 +0200 Subject: [PATCH] tor-browser-bundle-bin: parameterize icon theme --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 8cbe788f1fd9..d2e4d69a19e1 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -42,7 +42,7 @@ # Wrapper runtime , coreutils , glibcLocales -, hicolor-icon-theme +, defaultIconTheme , shared-mime-info , gsettings-desktop-schemas @@ -265,7 +265,7 @@ stdenv.mkDerivation rec { EOF WRAPPER_XDG_DATA_DIRS=${concatMapStringsSep ":" (x: "${x}/share") [ - hicolor-icon-theme + defaultIconTheme shared-mime-info ]} WRAPPER_XDG_DATA_DIRS+=":"${concatMapStringsSep ":" (x: "${x}/share/gsettings-schemas/${x.name}") [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 39644a02cbe3..b77806ddec69 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5587,7 +5587,9 @@ with pkgs; tor-arm = callPackage ../tools/security/tor/tor-arm.nix { }; - tor-browser-bundle-bin = callPackage ../applications/networking/browsers/tor-browser-bundle-bin { }; + tor-browser-bundle-bin = callPackage ../applications/networking/browsers/tor-browser-bundle-bin { + inherit (gnome3) defaultIconTheme; + }; tor-browser-bundle = callPackage ../applications/networking/browsers/tor-browser-bundle { stdenv = stdenvNoCC;