diff options
author | Daniel Schaefer <git@danielschaefer.me> | 2019-09-13 15:00:54 +0200 |
---|---|---|
committer | Daniel Schaefer <git@danielschaefer.me> | 2019-09-13 15:02:37 +0200 |
commit | acf571eec4e70447bb7b8abcd1856c16b1af5772 (patch) | |
tree | 26e341b718b36d312be25cb740100963cb79b287 | |
parent | e0b945b166638d65f6ba660c6eb8ec98da47e3ae (diff) |
httplz: Fix build with openssl_1_0_2
The rust crate dependency that wraps OpenSSL doesn't support the Openssl
1.1.
-rw-r--r-- | pkgs/tools/networking/httplz/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/networking/httplz/default.nix b/pkgs/tools/networking/httplz/default.nix index b7ee85da9d8d..001041a0799e 100644 --- a/pkgs/tools/networking/httplz/default.nix +++ b/pkgs/tools/networking/httplz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkgs, darwin }: +{ stdenv, lib, fetchFromGitHub, rustPlatform, openssl, pkgconfig, darwin, libiconv }: rustPlatform.buildRustPackage rec { pname = "httplz"; @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0q9ng8vf01k65zmcm7bbkqyrkj5hs86zdxwrfj98f4xqxrm75rf6"; }; - buildInputs = with pkgs; [ openssl pkgconfig ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; + buildInputs = [ openssl pkgconfig ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; cargoBuildFlags = [ "--bin httplz" ]; cargoPatches = [ ./cargo-lock.patch ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a315698ccd95..4f5726f9b30d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3855,7 +3855,7 @@ in httping = callPackage ../tools/networking/httping {}; - httplz = callPackage ../tools/networking/httplz { }; + httplz = callPackage ../tools/networking/httplz { openssl = openssl_1_0_2; }; httpfs2 = callPackage ../tools/filesystems/httpfs { }; |