public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12199 from jgillich/torbrowser-desktop

Browse Source 
torbrowser: add .desktop file
This commit is contained in:
Franz Pletz 2016-01-18 15:28:43 +01:00
commit 5160c8887e
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pkgs/tools/security/tor/torbrowser.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, buildEnv { stdenv, fetchurl, buildEnv, makeDesktopItem
, xorg, alsaLib, dbus, dbus_glib, glib, gtk, atk, pango, freetype, fontconfig , xorg, alsaLib, dbus, dbus_glib, glib, gtk, atk, pango, freetype, fontconfig
, gdk_pixbuf, cairo, zlib}: , gdk_pixbuf, cairo, zlib}:
let let
@ -16,13 +16,23 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "tor-browser-${version}"; name = "tor-browser-${version}";
version = "5.0.6"; version = "5.0.7";
src = fetchurl { 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"; 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 sha256 = if stdenv.is64bit then
"1ix05760l9j6bwbswd2fnk4b6nrrzxp3b8abvm4y4979pkkmasfw" else "0igqh02bcdr0b4m6df46l1l1z38d4nh4pyfn6jqsvahacdl2qbsg" else
"1q5mf91xxj1xs4ajj9i6mdhnzqycbdvprkzskx8pl6j9ll2hlsyh"; "1401j340348rqwd5c1m8hnxw7qkwpzqfa64q01cp08lz9cxxml4r";
};
desktopItem = makeDesktopItem {
name = "torbrowser";
exec = "tor-browser";
icon = "torbrowser";
desktopName = "Tor Browser";
genericName = "Tor Browser";
comment = meta.description;
categories = "Network;WebBrowser;Security;";
}; };
patchPhase = '' patchPhase = ''
@ -57,15 +67,20 @@ in stdenv.mkDerivation rec {
$out/share/tor-browser/Browser/firefox -no-remote -profile ~/Data/Browser/profile.default "$@" $out/share/tor-browser/Browser/firefox -no-remote -profile ~/Data/Browser/profile.default "$@"
EOF EOF
chmod +x $out/bin/tor-browser 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 ]; buildInputs = [ stdenv ];
meta = { meta = with stdenv.lib; {
description = "Tor Browser Bundle"; description = "Tor Browser Bundle";
homepage = https://www.torproject.org/; homepage = https://www.torproject.org/;
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux;
maintainers = with stdenv.lib.maintainers; maintainers = with maintainers; [ offline matejc doublec thoughtpolice ];
[ offline matejc doublec thoughtpolice ];
}; };
} }