cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #153145 from veprbl/pr/dprint_darwin_fix

Browse source 
dprint: fix darwin build
This commit is contained in:
Jörg Thalheim 2022-01-02 06:16:44 +00:00 committed by GitHub
commit 28d58b9792
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/tools/dprint/default.nix
View file

@ -1,4 +1,4 @@
{ lib, fetchCrate, rustPlatform }: { lib, stdenv, fetchCrate, rustPlatform, Security }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "dprint"; pname = "dprint";
@ -11,6 +11,8 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-ezfVDgZs0QemYHm/o3aX2QGO2WuMweE8LuNZaX4whhw="; cargoSha256 = "sha256-ezfVDgZs0QemYHm/o3aX2QGO2WuMweE8LuNZaX4whhw=";
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
# Tests fail because they expect a test WASM plugin. Tests already run for # Tests fail because they expect a test WASM plugin. Tests already run for
# every commit upstream on GitHub Actions # every commit upstream on GitHub Actions
doCheck = false; doCheck = false;

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

@ -14513,7 +14513,9 @@ with pkgs;
cwltool = callPackage ../applications/science/misc/cwltool { }; cwltool = callPackage ../applications/science/misc/cwltool { };
dprint = callPackage ../development/tools/dprint { }; dprint = callPackage ../development/tools/dprint {
inherit (darwin.apple_sdk.frameworks) Security;
};
libcxx = llvmPackages.libcxx; libcxx = llvmPackages.libcxx;
libcxxabi = llvmPackages.libcxxabi; libcxxabi = llvmPackages.libcxxabi;