git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #68660 from JohnAZoidberg/httplz-openssl102

httplz: Fix build with openssl_1_0_2

commita52c77fbea3fc19fec88060b3bca3c5b5039ef49 authorWilliButz <WilliButz@users.noreply.github.com> dateSat 14 Sep 2019, 11:26 (7 years ago) parent962bfd3acf571e
2 files changed+3−3
pkgs/tools/networking/httplz/default.nix+2−2 pkgs/top-level/all-packages.nix+1−1
pkgs/tools/networking/httplz/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, rustPlatform, pkgs, darwin }:
1+{ stdenv, lib, fetchFromGitHub, rustPlatform, openssl, pkgconfig, darwin, libiconv }:
22
33rustPlatform.buildRustPackage rec {
44 pname = "httplz";
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
1111 sha256 = "0q9ng8vf01k65zmcm7bbkqyrkj5hs86zdxwrfj98f4xqxrm75rf6";
1212 };
1313
14− buildInputs = with pkgs; [ openssl pkgconfig ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];
14+ buildInputs = [ openssl pkgconfig ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];
1515
1616 cargoBuildFlags = [ "--bin httplz" ];
1717 cargoPatches = [ ./cargo-lock.patch ];
pkgs/top-level/all-packages.nix+1−1
@@ -3855,7 +3855,7 @@ in
38553855
38563856 httping = callPackage ../tools/networking/httping {};
38573857
3858− httplz = callPackage ../tools/networking/httplz { };
3858+ httplz = callPackage ../tools/networking/httplz { openssl = openssl_1_0_2; };
38593859
38603860 httpfs2 = callPackage ../tools/filesystems/httpfs { };
38613861