summary refs log tree commit diff
path: root/pkgs/development/tools/wrangler/default.nix
diff options
context:
space:
mode:
authorDaniël de Kok <me@danieldk.eu>2021-03-04 10:40:58 +0100
committerDaniël de Kok <me@danieldk.eu>2021-03-07 08:08:42 +0100
commit3e2943ab8eda2c0bf13210110e57d60a49a6177c (patch)
treeb18a15cccba3d2eca0d3ccd4e32747ed3ded9346 /pkgs/development/tools/wrangler/default.nix
parent374f9a7c3b913de2e8a056698fda5f860a6e8259 (diff)
downloadnixpkgs-3e2943ab8eda2c0bf13210110e57d60a49a6177c.tar
nixpkgs-3e2943ab8eda2c0bf13210110e57d60a49a6177c.tar.gz
nixpkgs-3e2943ab8eda2c0bf13210110e57d60a49a6177c.tar.bz2
nixpkgs-3e2943ab8eda2c0bf13210110e57d60a49a6177c.tar.lz
nixpkgs-3e2943ab8eda2c0bf13210110e57d60a49a6177c.tar.xz
nixpkgs-3e2943ab8eda2c0bf13210110e57d60a49a6177c.tar.zst
nixpkgs-3e2943ab8eda2c0bf13210110e57d60a49a6177c.zip
wrangler: build against system OpenSSL
Wrangler was built against a vendored, static OpenSSL. Use the system
OpenSSL instead to benefit from security updates, etc.
Diffstat (limited to 'pkgs/development/tools/wrangler/default.nix')
-rw-r--r--pkgs/development/tools/wrangler/default.nix9
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/development/tools/wrangler/default.nix b/pkgs/development/tools/wrangler/default.nix
index f867fd836a3..f43a0a369d6 100644
--- a/pkgs/development/tools/wrangler/default.nix
+++ b/pkgs/development/tools/wrangler/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, Security, CoreServices, CoreFoundation, perl }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, Security, CoreServices, CoreFoundation }:
 
 rustPlatform.buildRustPackage rec {
   pname = "wrangler";
@@ -13,12 +13,13 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "0w845virvw7mvibc76ar2hbffhfzj2v8v1xkrsssrgzyaryb48jk";
 
-  nativeBuildInputs = [ perl ]
-    ++ lib.optionals stdenv.isLinux [ pkg-config ];
+  nativeBuildInputs = [ pkg-config ];
 
-  buildInputs = lib.optionals stdenv.isLinux [ openssl ]
+  buildInputs = [ openssl ]
     ++ lib.optionals stdenv.isDarwin [ curl CoreFoundation CoreServices Security ];
 
+  OPENSSL_NO_VENDOR = 1;
+
   # tries to use "/homeless-shelter" and fails
   doCheck = false;