public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

httplz: Fix build with openssl_1_0_2

Browse Source 
The rust crate dependency that wraps OpenSSL doesn't support the Openssl
1.1.
This commit is contained in:
Daniel Schaefer 2019-09-13 15:00:54 +02:00
parent e0b945b166
commit acf571eec4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/networking/httplz/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, rustPlatform, pkgs, darwin }: { stdenv, lib, fetchFromGitHub, rustPlatform, openssl, pkgconfig, darwin, libiconv }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "httplz"; pname = "httplz";
@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "0q9ng8vf01k65zmcm7bbkqyrkj5hs86zdxwrfj98f4xqxrm75rf6"; 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" ]; cargoBuildFlags = [ "--bin httplz" ];
cargoPatches = [ ./cargo-lock.patch ]; cargoPatches = [ ./cargo-lock.patch ];

2
pkgs/top-level/all-packages.nix
View File

@ -3855,7 +3855,7 @@ in
httping = callPackage ../tools/networking/httping {}; 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 { }; httpfs2 = callPackage ../tools/filesystems/httpfs { };