From f4a3ea123bf9faeac026c7b70df4502d75e50c74 Mon Sep 17 00:00:00 2001
From: Matej Cotman <cotman.matej@gmail.com>
Date: Sat, 1 Mar 2014 22:37:39 +0100
Subject: [PATCH] fix torbrowser build by adding /lib64 for 64 bit systems

---
 pkgs/tools/security/tor/torbrowser.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix
index cd1fda47e437..2554e999e0d3 100644
--- a/pkgs/tools/security/tor/torbrowser.nix
+++ b/pkgs/tools/security/tor/torbrowser.nix
@@ -15,6 +15,9 @@ let
     ];
   };
 
+  ldLibraryPath = if bits == "64" then torEnv+"/lib:"+torEnv+"/lib64"
+        else torEnv+"/lib";
+
 in stdenv.mkDerivation rec {
   name = "tor-browser-${version}";
   version = "3.5";
@@ -36,7 +39,7 @@ in stdenv.mkDerivation rec {
     # Just do a simple test if all libraries get loaded by running help on
     # firefox and tor
     echo "Checking firefox..."
-    LD_LIBRARY_PATH=${torEnv}/lib Browser/firefox --help 1> /dev/null
+    LD_LIBRARY_PATH=${ldLibraryPath} Browser/firefox --help 1> /dev/null
     echo "Checking tor..."
     LD_LIBRARY_PATH=${torEnv}/lib:Tor Tor/tor --help 1> /dev/null
   '';
@@ -53,7 +56,7 @@ in stdenv.mkDerivation rec {
         echo "pref(\"extensions.torlauncher.tordatadir_path\", \"\$HOME/Data/Tor/\");" >> \
           ~/Data/Browser/profile.default/preferences/extension-overrides.js
       fi
-      export LD_LIBRARY_PATH=${torEnv}/lib:$out/share/tor-browser/Tor
+      export LD_LIBRARY_PATH=${ldLibraryPath}:$out/share/tor-browser/Tor
       $out/share/tor-browser/Browser/firefox -no-remote -profile ~/Data/Browser/profile.default "$@"
     EOF
     chmod +x $out/bin/tor-browser
@@ -65,6 +68,6 @@ in stdenv.mkDerivation rec {
     description = "Tor Browser Bundle for GNU/Linux, everything you need to safely browse the Internet";
     homepage = https://www.torproject.org/;
     platforms = ["i686-linux" "x86_64-linux"];
-    maintainers = [ maintainers.offline ];
+    maintainers = [ maintainers.offline maintainers.matejc ];
   };
 }