From 513341434c3573c4c18ec4340d90b5a087d64aee Mon Sep 17 00:00:00 2001 From: SLNOS Date: Tue, 15 Aug 2017 00:00:00 +0000 Subject: [PATCH] firefoxPackages: tor-browser: reorganize expression --- .../networking/browsers/firefox/packages.nix | 36 +++++++++++-------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index fa34b18ee49..20874ee030c 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -45,20 +45,9 @@ rec { }; } {}; - tor-browser = common rec { - pname = "tor-browser"; - version = "6.5.2"; - isTorBrowserLike = true; - extraConfigureFlags = [ "--disable-loop" ]; - - # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb - src = fetchFromGitHub { - owner = "SLNOS"; - repo = "tor-browser"; - rev = "tor-browser-45.8.0esr-6.5-2"; - sha256 = "0vbcp1qlxjlph0dqibylsyvb8iah3lnzdxc56hllpvbn51vrp39j"; - }; +} // (let + commonAttrs = { overrides = { unpackPhase = '' # fetchFromGitHub produces ro sources, root dir gets a name that @@ -102,9 +91,26 @@ rec { homepage = https://www.torproject.org/projects/torbrowser.html; platforms = lib.platforms.linux; }; - } { + }; + +in rec { + + tor-browser = common (rec { + pname = "tor-browser"; + version = "6.5.2"; + isTorBrowserLike = true; + extraConfigureFlags = [ "--disable-loop" ]; + + # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb + src = fetchFromGitHub { + owner = "SLNOS"; + repo = "tor-browser"; + rev = "tor-browser-45.8.0esr-6.5-2"; + sha256 = "0vbcp1qlxjlph0dqibylsyvb8iah3lnzdxc56hllpvbn51vrp39j"; + }; + } // commonAttrs) { stdenv = overrideCC stdenv gcc5; ffmpegSupport = false; }; -} +})