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

wranger: remove darwin from inputs

Browse Source
This commit is contained in:
Sandro Jäckel 2021-03-04 12:54:24 +01:00
parent ccfef0d23a
commit cca48ed2d0
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/tools/wrangler/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, darwin, perl }: { lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, Security, CoreServices, CoreFoundation, perl }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "wrangler"; pname = "wrangler";
@ -13,15 +13,11 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "0w845virvw7mvibc76ar2hbffhfzj2v8v1xkrsssrgzyaryb48jk"; cargoSha256 = "0w845virvw7mvibc76ar2hbffhfzj2v8v1xkrsssrgzyaryb48jk";
nativeBuildInputs = [ perl ] ++ lib.optionals stdenv.isLinux [ pkg-config ]; nativeBuildInputs = [ perl ]
++ lib.optionals stdenv.isLinux [ pkg-config ];
buildInputs = lib.optionals stdenv.isLinux [ openssl ] buildInputs = lib.optionals stdenv.isLinux [ openssl ]
++ lib.optionals stdenv.isDarwin [ ++ lib.optionals stdenv.isDarwin [ curl CoreFoundation CoreServices Security ];
curl
darwin.apple_sdk.frameworks.Security
darwin.apple_sdk.frameworks.CoreServices
darwin.apple_sdk.frameworks.CoreFoundation
];
# tries to use "/homeless-shelter" and fails # tries to use "/homeless-shelter" and fails
doCheck = false; doCheck = false;

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

@ -3942,7 +3942,9 @@ in
wallutils = callPackage ../tools/graphics/wallutils { }; wallutils = callPackage ../tools/graphics/wallutils { };
wrangler = callPackage ../development/tools/wrangler { }; wrangler = callPackage ../development/tools/wrangler {
inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security;
};
wsl-open = callPackage ../tools/misc/wsl-open { }; wsl-open = callPackage ../tools/misc/wsl-open { };