diff options
| author | Felix Schröter <dev@felschr.com> | 2023-10-15 18:22:29 +0200 |
|---|---|---|
| committer | Felix Schröter <dev@felschr.com> | 2023-12-10 02:48:50 +0100 |
| commit | 5bb8d4a70e8672b9e21b99c1ed7d334be0b4ac70 (patch) | |
| tree | 61b44bda40176d443dfd30b4a1604d2d3ceb9d7e /pkgs/applications/networking/browsers | |
| parent | 8ba995cb305900425103687cfd346ffd6beaf35d (diff) | |
| download | nixlib-5bb8d4a70e8672b9e21b99c1ed7d334be0b4ac70.tar nixlib-5bb8d4a70e8672b9e21b99c1ed7d334be0b4ac70.tar.gz nixlib-5bb8d4a70e8672b9e21b99c1ed7d334be0b4ac70.tar.bz2 nixlib-5bb8d4a70e8672b9e21b99c1ed7d334be0b4ac70.tar.lz nixlib-5bb8d4a70e8672b9e21b99c1ed7d334be0b4ac70.tar.xz nixlib-5bb8d4a70e8672b9e21b99c1ed7d334be0b4ac70.tar.zst nixlib-5bb8d4a70e8672b9e21b99c1ed7d334be0b4ac70.zip | |
tor-browser: use copyDesktopItems
Diffstat (limited to 'pkgs/applications/networking/browsers')
| -rw-r--r-- | pkgs/applications/networking/browsers/tor-browser/default.nix | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/pkgs/applications/networking/browsers/tor-browser/default.nix b/pkgs/applications/networking/browsers/tor-browser/default.nix index 76cdf1c1df5a..bb2c82145e0d 100644 --- a/pkgs/applications/networking/browsers/tor-browser/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser/default.nix @@ -1,6 +1,7 @@ { lib, stdenv , fetchurl , makeDesktopItem +, copyDesktopItems , writeText , autoPatchelfHook , callPackage @@ -149,7 +150,7 @@ stdenv.mkDerivation rec { src = sources.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}"); - nativeBuildInputs = [ autoPatchelfHook ]; + nativeBuildInputs = [ autoPatchelfHook copyDesktopItems ]; buildInputs = [ gtk3 alsa-lib @@ -160,15 +161,15 @@ stdenv.mkDerivation rec { preferLocalBuild = true; allowSubstitutes = false; - desktopItem = makeDesktopItem { + desktopItems = [(makeDesktopItem { name = "torbrowser"; - exec = "tor-browser"; - icon = "torbrowser"; + exec = "tor-browser %U"; + icon = "tor-browser"; desktopName = "Tor Browser"; genericName = "Web Browser"; comment = meta.description; categories = [ "Network" "WebBrowser" "Security" ]; - }; + })]; buildPhase = '' runHook preBuild @@ -435,12 +436,7 @@ stdenv.mkDerivation rec { mkdir -p $out/share/doc ln -s $TBB_IN_STORE/TorBrowser/Docs $out/share/doc/tor-browser - # Install .desktop item - mkdir -p $out/share/applications - 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=tor-browser," + # Install icons 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 |