mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-23 04:25:14 +00:00
Merge pull request #214210 from obsidiansystems/stunnel-improvements
This commit is contained in:
commit
58843af787
@ -1,9 +1,15 @@
|
|||||||
{ lib, stdenv, fetchurl, openssl, nixosTests }:
|
{ lib, stdenv, fetchurl, openssl
|
||||||
|
, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd
|
||||||
|
, nixosTests
|
||||||
|
}:
|
||||||
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "stunnel";
|
pname = "stunnel";
|
||||||
version = "5.67";
|
version = "5.67";
|
||||||
|
|
||||||
|
outputs = [ "out" "doc" "man" ];
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://www.stunnel.org/archive/${lib.versions.major version}.x/${pname}-${version}.tar.gz";
|
url = "https://www.stunnel.org/archive/${lib.versions.major version}.x/${pname}-${version}.tar.gz";
|
||||||
sha256 = "3086939ee6407516c59b0ba3fbf555338f9d52f459bcab6337c0f00e91ea8456";
|
sha256 = "3086939ee6407516c59b0ba3fbf555338f9d52f459bcab6337c0f00e91ea8456";
|
||||||
@ -11,11 +17,19 @@ stdenv.mkDerivation rec {
|
|||||||
# not the output of `nix-prefetch-url`
|
# not the output of `nix-prefetch-url`
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ openssl ];
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
buildInputs = [
|
||||||
|
openssl
|
||||||
|
] ++ lib.optionals systemdSupport [
|
||||||
|
systemd
|
||||||
|
];
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--with-ssl=${openssl.dev}"
|
"--with-ssl=${openssl.dev}"
|
||||||
"--sysconfdir=/etc"
|
"--sysconfdir=/etc"
|
||||||
"--localstatedir=/var"
|
"--localstatedir=/var"
|
||||||
|
(lib.enableFeature systemdSupport "systemd")
|
||||||
];
|
];
|
||||||
|
|
||||||
postInstall = ''
|
postInstall = ''
|
||||||
|
Loading…
Reference in New Issue
Block a user