diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-01-18 15:28:43 +0100 |
---|---|---|
committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-01-18 15:28:43 +0100 |
commit | 5160c8887ee8b18955ff50fd7decd34a40a0356d (patch) | |
tree | 7679cc01ce10de34c69e5bed668ef05f56adef76 | |
parent | 5cf03589a4087901e7957c06221ea29917ec9189 (diff) | |
parent | 87c3063d686ffa8a8eb928e23c8db70f61e45b7b (diff) | |
download | nixlib-5160c8887ee8b18955ff50fd7decd34a40a0356d.tar nixlib-5160c8887ee8b18955ff50fd7decd34a40a0356d.tar.gz nixlib-5160c8887ee8b18955ff50fd7decd34a40a0356d.tar.bz2 nixlib-5160c8887ee8b18955ff50fd7decd34a40a0356d.tar.lz nixlib-5160c8887ee8b18955ff50fd7decd34a40a0356d.tar.xz nixlib-5160c8887ee8b18955ff50fd7decd34a40a0356d.tar.zst nixlib-5160c8887ee8b18955ff50fd7decd34a40a0356d.zip |
Merge pull request #12199 from jgillich/torbrowser-desktop
torbrowser: add .desktop file
-rw-r--r-- | pkgs/tools/security/tor/torbrowser.nix | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index ccfd4ae044d6..ca3e3aa10566 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildEnv +{ stdenv, fetchurl, buildEnv, makeDesktopItem , xorg, alsaLib, dbus, dbus_glib, glib, gtk, atk, pango, freetype, fontconfig , gdk_pixbuf, cairo, zlib}: let @@ -16,13 +16,23 @@ let in stdenv.mkDerivation rec { name = "tor-browser-${version}"; - version = "5.0.6"; + version = "5.0.7"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${if stdenv.is64bit then "64" else "32"}-${version}_en-US.tar.xz"; sha256 = if stdenv.is64bit then - "1ix05760l9j6bwbswd2fnk4b6nrrzxp3b8abvm4y4979pkkmasfw" else - "1q5mf91xxj1xs4ajj9i6mdhnzqycbdvprkzskx8pl6j9ll2hlsyh"; + "0igqh02bcdr0b4m6df46l1l1z38d4nh4pyfn6jqsvahacdl2qbsg" else + "1401j340348rqwd5c1m8hnxw7qkwpzqfa64q01cp08lz9cxxml4r"; + }; + + desktopItem = makeDesktopItem { + name = "torbrowser"; + exec = "tor-browser"; + icon = "torbrowser"; + desktopName = "Tor Browser"; + genericName = "Tor Browser"; + comment = meta.description; + categories = "Network;WebBrowser;Security;"; }; patchPhase = '' @@ -57,15 +67,20 @@ in stdenv.mkDerivation rec { $out/share/tor-browser/Browser/firefox -no-remote -profile ~/Data/Browser/profile.default "$@" EOF chmod +x $out/bin/tor-browser + + mkdir -p $out/share/applications + cp $desktopItem/share/applications"/"* $out/share/applications + + mkdir -p $out/share/pixmaps + cp Browser/browser/icons/mozicon128.png $out/share/pixmaps/torbrowser.png ''; buildInputs = [ stdenv ]; - meta = { + meta = with stdenv.lib; { description = "Tor Browser Bundle"; homepage = https://www.torproject.org/; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; - [ offline matejc doublec thoughtpolice ]; + platforms = platforms.linux; + maintainers = with maintainers; [ offline matejc doublec thoughtpolice ]; }; } |