Merge pull request #140658 from alyssais/firefox-bin-https
firefox-bin: HTTPS for homepage and updateScript
This commit is contained in:
commit
006ffd8252
|
@ -199,12 +199,12 @@ stdenv.mkDerivation {
|
|||
inherit pname channel writeScript xidel coreutils gnused gnugrep gnupg curl runtimeShell;
|
||||
baseUrl =
|
||||
if channel == "devedition"
|
||||
then "http://archive.mozilla.org/pub/devedition/releases/"
|
||||
else "http://archive.mozilla.org/pub/firefox/releases/";
|
||||
then "https://archive.mozilla.org/pub/devedition/releases/"
|
||||
else "https://archive.mozilla.org/pub/firefox/releases/";
|
||||
};
|
||||
meta = with lib; {
|
||||
description = "Mozilla Firefox, free web browser (binary package)";
|
||||
homepage = "http://www.mozilla.org/firefox/";
|
||||
homepage = "https://www.mozilla.org/firefox/";
|
||||
license = licenses.mpl20;
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
platforms = builtins.attrNames mozillaPlatforms;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchsvn, fetchFromGitHub, fpc }:
|
||||
{ lib, stdenv, fetchsvn, fetchFromGitHub, fpc, openssl }:
|
||||
|
||||
let
|
||||
flreSrc = fetchFromGitHub {
|
||||
|
@ -36,6 +36,9 @@ in stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ fpc ];
|
||||
buildInputs = [ openssl ];
|
||||
|
||||
NIX_LDFLAGS = [ "-lcrypto" ];
|
||||
|
||||
patchPhase = ''
|
||||
patchShebangs \
|
||||
|
|
Loading…
Reference in a new issue