Merge #103474: firefox, thunderbird: revert meta.timeout
This commit is contained in:
commit
b94e7b7d89
@ -26,7 +26,6 @@ rec {
|
||||
broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory".
|
||||
# not in `badPlatforms` because cross-compilation on 64-bit machine might work.
|
||||
license = lib.licenses.mpl20;
|
||||
timeout = 28800; # eight hours
|
||||
};
|
||||
updateScript = callPackage ./update.nix {
|
||||
attrPath = "firefox-unwrapped";
|
||||
|
@ -332,6 +332,5 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
platforms = platforms.linux;
|
||||
license = licenses.mpl20;
|
||||
timeout = 28800; # eight hours
|
||||
};
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user