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

cargo-web: remove cf-private

This commit is contained in:
Daiderd Jordan 2019-06-19 19:56:22 +02:00
parent c2205238ab
commit 4b64dfaee9
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/tools/cargo-web/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, openssl, perl, pkgconfig, rustPlatform { stdenv, fetchFromGitHub, openssl, perl, pkgconfig, rustPlatform
, CoreServices, Security, cf-private , CoreServices, Security
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -16,11 +16,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "1f4sj260q4rlzbajwimya1yhh90hmmbhr47yfg9i8xcv5cg0cqjn"; cargoSha256 = "1f4sj260q4rlzbajwimya1yhh90hmmbhr47yfg9i8xcv5cg0cqjn";
nativeBuildInputs = [ openssl perl pkgconfig ]; nativeBuildInputs = [ openssl perl pkgconfig ];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ];
CoreServices Security
# Needed for CFURLResourceIsReachable symbols.
cf-private
];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A Cargo subcommand for the client-side Web"; description = "A Cargo subcommand for the client-side Web";

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

@ -8032,7 +8032,6 @@ in
cargo-web = callPackage ../development/tools/cargo-web { cargo-web = callPackage ../development/tools/cargo-web {
inherit (darwin.apple_sdk.frameworks) CoreServices Security; inherit (darwin.apple_sdk.frameworks) CoreServices Security;
inherit (darwin) cf-private;
}; };
carnix = (callPackage ../build-support/rust/carnix.nix { }).carnix { }; carnix = (callPackage ../build-support/rust/carnix.nix { }).carnix { };