BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #200480 from dit7ya/cotton-darwin

Browse source 
cotton: fix build on darwin
This commit is contained in:
Ryan Burns 2022-11-10 01:32:40 -08:00 committed by GitHub
commit d46b10c653
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/tools/cotton/default.nix
View file

@ -1,6 +1,8 @@
{ lib
{ stdenv
, lib
, rustPlatform
, fetchFromGitHub
, CoreServices
}:
rustPlatform.buildRustPackage rec {
@ -16,6 +18,8 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-qpV3UriOidIk/0di9d8RjXvjcjgD6dXqg7wLAywI66o=";
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
meta = with lib; {
description = "A package manager for JavaScript projects";
homepage = "https://github.com/danielhuang/cotton";

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

@ -13640,7 +13640,9 @@ with pkgs;
copper = callPackage ../development/compilers/copper {};
cotton = callPackage ../development/tools/cotton { };
cotton = callPackage ../development/tools/cotton {
inherit (darwin.apple_sdk.frameworks) CoreServices;
};
inherit (callPackages ../development/compilers/crystal {
llvmPackages = if stdenv.system == "aarch64-darwin" then llvmPackages_11 else llvmPackages_10;