Unverified Commit 6bb2aa16 authored by Emily's avatar Emily Committed by GitHub
Browse files

treewide: devendor OpenSSL from Rust packages (#339805)

parents 1d71b24d bd9cd90d

pkgs/applications/blockchains/lighthouse/default.nix

+5 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
, lighthouse

, nix-update-script

, nodePackages

, perl

, openssl

, pkg-config

, postgresql

, protobuf
@@ -57,7 +57,6 @@ rustPlatform.buildRustPackage rec { 
  nativeBuildInputs = [

    rustPlatform.bindgenHook

    cmake

    perl

    pkg-config

    protobuf

  ];
@@ -65,6 +64,8 @@ rustPlatform.buildRustPackage rec { 
  buildInputs = [

    rust-jemalloc-sys

    sqlite

  ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [

    openssl

  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [

    CoreFoundation

    Security
@@ -84,6 +85,8 @@ rustPlatform.buildRustPackage rec { 
  LIGHTHOUSE_DEPOSIT_CONTRACT_SPEC_URL = "file://${depositContractSpec}";

  LIGHTHOUSE_DEPOSIT_CONTRACT_TESTNET_URL = "file://${testnetDepositContractSpec}";



  OPENSSL_NO_VENDOR = true;



  cargoBuildFlags = [

    "--package lighthouse"

  ];

pkgs/by-name/av/avml/package.nix

+8 −2
Original line number Diff line number Diff line
@@ -2,7 +2,8 @@ 
  lib,

  fetchFromGitHub,

  rustPlatform,

  perl,

  pkg-config,

  openssl,

  testers,

  avml,

  nix-update-script,
@@ -21,7 +22,12 @@ rustPlatform.buildRustPackage rec { 


  cargoHash = "sha256-gcpjrxnQDyO92OW6LZVc4x73TmTtQoaEYhmGmqhz8ng=";



  nativeBuildInputs = [ perl ];

  nativeBuildInputs = [ pkg-config ];

  buildInputs = [ openssl ];



  env = {

    OPENSSL_NO_VENDOR = true;

  };



  passthru.tests.version = testers.testVersion { package = avml; };

pkgs/by-name/de/deltachat-repl/package.nix

+4 −2
Original line number Diff line number Diff line 
{ rustPlatform

, libdeltachat

, perl

, pkg-config

}:
@@ -10,10 +9,13 @@ rustPlatform.buildRustPackage { 
  inherit (libdeltachat) version src cargoLock buildInputs;



  nativeBuildInputs = [

    perl

    pkg-config

  ];



  env = {

    OPENSSL_NO_VENDOR = true;

  };



  cargoBuildFlags = [ "--package" "deltachat-repl" ];



  doCheck = false;

pkgs/by-name/de/deltachat-rpc-server/package.nix

+4 −2
Original line number Diff line number Diff line 
{ rustPlatform

, libdeltachat

, perl

, pkg-config

}:
@@ -10,10 +9,13 @@ rustPlatform.buildRustPackage { 
  inherit (libdeltachat) version src cargoLock buildInputs;



  nativeBuildInputs = [

    perl

    pkg-config

  ];



  env = {

    OPENSSL_NO_VENDOR = true;

  };



  cargoBuildFlags = [ "--package" "deltachat-rpc-server" ];



  doCheck = false;

pkgs/development/tools/rover/default.nix

+10 −3
Original line number Diff line number Diff line 
{ lib

, fetchFromGitHub

, perl

, pkg-config

, rustPlatform

, openssl

, darwin

, stdenv

}:
@@ -19,16 +20,22 @@ rustPlatform.buildRustPackage rec { 


  cargoHash = "sha256-Rf4kRXYW+WAF1rM7o8PmXBLgp/YyA8y/TqbZL22VOqI=";



  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [

  buildInputs = [

    openssl

  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [

    darwin.apple_sdk.frameworks.Security

    darwin.apple_sdk.frameworks.CoreServices

    darwin.apple_sdk.frameworks.SystemConfiguration

  ];



  nativeBuildInputs = [

    perl

    pkg-config

  ];



  env = {

    OPENSSL_NO_VENDOR = true;

  };



  # This test checks whether the plugins specified in the plugins json file are

  # valid by making a network call to the repo that houses their binaries; but, the

  # build env can't make network calls (impurity)