Unverified Commit d46b10c6 authored by Ryan Burns's avatar Ryan Burns Committed by GitHub
Browse files

Merge pull request #200480 from dit7ya/cotton-darwin 

cotton: fix build on darwin
parents 7f52c75a 184023a1

pkgs/development/tools/cotton/default.nix

+5 −1
Original line number Diff line number Diff line 
{ 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";

pkgs/top-level/all-packages.nix

+3 −1
Original line number Diff line number Diff line
@@ -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;