firefoxPackages: tor-browser: reorganize expression
This commit is contained in:
parent
a681afb8f1
commit
513341434c
@ -45,20 +45,9 @@ rec {
|
|||||||
};
|
};
|
||||||
} {};
|
} {};
|
||||||
|
|
||||||
tor-browser = common rec {
|
} // (let
|
||||||
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 = {
|
||||||
overrides = {
|
overrides = {
|
||||||
unpackPhase = ''
|
unpackPhase = ''
|
||||||
# fetchFromGitHub produces ro sources, root dir gets a name that
|
# fetchFromGitHub produces ro sources, root dir gets a name that
|
||||||
@ -102,9 +91,26 @@ rec {
|
|||||||
homepage = https://www.torproject.org/projects/torbrowser.html;
|
homepage = https://www.torproject.org/projects/torbrowser.html;
|
||||||
platforms = lib.platforms.linux;
|
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;
|
stdenv = overrideCC stdenv gcc5;
|
||||||
ffmpegSupport = false;
|
ffmpegSupport = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
})
|
||||||
|
Loading…
Reference in New Issue
Block a user