Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b03da424c6b9
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dc2f24796eb7
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 19, 2019

  1. Copy the full SHA
    0b424ec View commit details

Commits on Oct 20, 2019

  1. Merge pull request #71255 from shreyanshk/fix/tor-browser

    tor-browser-bundle-bin: fix icons
    worldofpeace authored Oct 20, 2019
    Copy the full SHA
    dc2f247 View commit details
Showing with 5 additions and 1 deletion.
  1. +5 −1 pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
Original file line number Diff line number Diff line change
@@ -379,7 +379,11 @@ stdenv.mkDerivation rec {
cp $desktopItem/share/applications"/"* $out/share/applications
sed -i $out/share/applications/torbrowser.desktop \
-e "s,Exec=.*,Exec=$out/bin/tor-browser," \
-e "s,Icon=.*,Icon=web-browser,"
-e "s,Icon=.*,Icon=tor-browser,"
for i in 16 32 48 64 128; do
mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps/
ln -s $out/share/tor-browser/browser/chrome/icons/default/default$i.png $out/share/icons/hicolor/''${i}x''${i}/apps/tor-browser.png
done
# Check installed apps
echo "Checking bundled Tor ..."