dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

trunk: fix build on darwin; move to by-name

Browse Source
This commit is contained in:
Alexander Sieg 2024-11-02 11:13:24 +01:00
parent d4f265a2ed
commit f9310ec1a9
No known key found for this signature in database
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/tools/trunk/default.nix → pkgs/by-name/tr/trunk/package.nix
View File

@ -1,11 +1,8 @@
{ lib,
stdenv,
rustPlatform,
fetchFromGitHub,
pkg-config,
openssl,
CoreServices,
SystemConfiguration
}:
rustPlatform.buildRustPackage rec {
@ -20,9 +17,7 @@ rustPlatform.buildRustPackage rec {
};
nativeBuildInputs = [ pkg-config ];
buildInputs = if stdenv.hostPlatform.isDarwin
then [ CoreServices SystemConfiguration ]
else [ openssl ];
buildInputs = [ openssl ];
# requires network
checkFlags = [ "--skip=tools::tests::download_and_install_binaries" ];

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

@ -12887,10 +12887,6 @@ with pkgs;
trezor-suite = callPackage ../applications/blockchains/trezor-suite { };
trunk = callPackage ../development/tools/trunk {
inherit (darwin.apple_sdk.frameworks) CoreServices SystemConfiguration;
};
trunk-ng = callPackage ../by-name/tr/trunk-ng/package.nix {
inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration;
};