3
0
Fork 0
forked from mirrors/nixpkgs

firefoxPackages: tor-browser: reorganize expression

This commit is contained in:
SLNOS 2017-08-15 00:00:00 +00:00 committed by Jan Malakhovski
parent a681afb8f1
commit 513341434c

View file

@ -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;
};
}
})