···4545 # The compiler-rt build infrastructure sniffs supported platforms on Darwin
4646 # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails
4747 # when it tries to use libc++ and libc++api for i386.
4848- "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}"
4848+ "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}"
4949+ "-DDARWIN_osx_BUILTIN_ARCHS=${stdenv.hostPlatform.darwinArch}"
4950 ];
50515152 outputs = [ "out" "dev" ];
···4545 # The compiler-rt build infrastructure sniffs supported platforms on Darwin
4646 # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails
4747 # when it tries to use libc++ and libc++api for i386.
4848- "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}"
4848+ "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}"
4949 ];
50505151 outputs = [ "out" "dev" ];
+1-1
pkgs/development/compilers/llvm/6/compiler-rt.nix
···4545 # The compiler-rt build infrastructure sniffs supported platforms on Darwin
4646 # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails
4747 # when it tries to use libc++ and libc++api for i386.
4848- "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}"
4848+ "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}"
4949 ];
50505151 outputs = [ "out" "dev" ];
+1-1
pkgs/development/compilers/llvm/7/compiler-rt.nix
···4545 # The compiler-rt build infrastructure sniffs supported platforms on Darwin
4646 # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails
4747 # when it tries to use libc++ and libc++api for i386.
4848- "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}"
4848+ "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}"
4949 ];
50505151 outputs = [ "out" "dev" ];
+1-1
pkgs/development/compilers/llvm/8/compiler-rt.nix
···4545 # The compiler-rt build infrastructure sniffs supported platforms on Darwin
4646 # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails
4747 # when it tries to use libc++ and libc++api for i386.
4848- "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}"
4848+ "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}"
4949 ];
50505151 outputs = [ "out" "dev" ];
+1-1
pkgs/development/compilers/llvm/9/compiler-rt.nix
···4545 # The compiler-rt build infrastructure sniffs supported platforms on Darwin
4646 # and finds i386;x86_64;x86_64h. We only build for x86_64, so linking fails
4747 # when it tries to use libc++ and libc++api for i386.
4848- "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.parsed.cpu.name}"
4848+ "-DDARWIN_osx_ARCHS=${stdenv.hostPlatform.darwinArch}"
4949 ];
50505151 outputs = [ "out" "dev" ];
···2233stdenv.mkDerivation rec {
44 pname = "ccloud-cli";
55- version = "0.202.0";
55+ version = "1.25.0";
6677 # To get the latest version:
88- # curl -L 'https://s3-us-west-2.amazonaws.com/confluent.cloud?prefix=ccloud-cli/archives/&delimiter=/' | nix run nixpkgs.libxml2 -c xmllint --format -
88+ # curl -L https://cnfl.io/ccloud-cli | sh -s -- -l | grep -v latest | sort -V | tail -n1
99 src = fetchurl (if stdenv.hostPlatform.isDarwin then {
1010 url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/ccloud-cli/archives/${version}/ccloud_v${version}_darwin_amd64.tar.gz";
1111- sha256 = "1w7c7fwpjj6f26nmcgm6rkrl4v9zhdpygkh02la77n23lg8wxah5";
1111+ sha256 = "0306jg36dpccwyy239r2xvw3bvsrnrdc88390g26fhcb0048qmgb";
1212 } else {
1313 url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/ccloud-cli/archives/${version}/ccloud_v${version}_linux_amd64.tar.gz";
1414- sha256 = "1xbhv2viw8cbwv03rfq99jddnw5lwy812a8xby348290l323xi89";
1414+ sha256 = "02sly7cxqlrfd6chamlp05k9ar93mpfrkx5183js0hf595nlki61";
1515 });
16161717 nativeBuildInputs = [ autoPatchelfHook ];
···2828 homepage = "https://docs.confluent.io/current/cloud/cli/index.html";
2929 license = licenses.unfree;
3030 maintainers = with maintainers; [ kalbasit ];
3131- platforms = platforms.linux ++ platforms.darwin;
3131+3232+ # TODO: There's support for i686 systems but I do not have any such system
3333+ # to build it locally on, it's also unfree so I cannot rely on ofborg to
3434+ # build it. Get the list of supported system by looking at the list of
3535+ # files in the S3 bucket:
3636+ #
3737+ # https://s3-us-west-2.amazonaws.com/confluent.cloud?prefix=ccloud-cli/archives/1.25.0/&delimiter=/%27
3838+ platforms = [ "x86_64-linux" "x86_64-darwin" ];
3239 };
3340}