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

Merge pull request #68660 from JohnAZoidberg/httplz-openssl102

Browse Source 
httplz: Fix build with openssl_1_0_2
This commit is contained in:
WilliButz 2019-09-14 11:26:14 +02:00 committed by GitHub
commit a52c77fbea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 {
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 ];

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

@ -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 { };