lol

Merge pull request #30045 from adisbladis/geth-osx-libusb

go-ethereum: Fix libusb segmentation faults on Darwin

authored by

Orivej Desh and committed by
GitHub
5562181d cb3d4437

+10 -3
+5 -2
pkgs/applications/altcoins/default.nix
··· 1 - { callPackage, boost155, boost162, boost163, openssl_1_1_0, haskellPackages }: 1 + { callPackage, boost155, boost162, boost163, openssl_1_1_0, haskellPackages, darwin }: 2 2 3 3 rec { 4 4 ··· 26 26 dogecoind = callPackage ./dogecoin.nix { withGui = false; }; 27 27 28 28 freicoin = callPackage ./freicoin.nix { boost = boost155; }; 29 - go-ethereum = callPackage ./go-ethereum.nix { }; 29 + go-ethereum = callPackage ./go-ethereum.nix { 30 + inherit (darwin) libobjc; 31 + inherit (darwin.apple_sdk.frameworks) IOKit; 32 + }; 30 33 go-ethereum-classic = callPackage ./go-ethereum-classic { }; 31 34 32 35 hivemind = callPackage ./hivemind.nix { withGui = true; };
+5 -1
pkgs/applications/altcoins/go-ethereum.nix
··· 1 - { stdenv, lib, buildGoPackage, fetchFromGitHub }: 1 + { stdenv, lib, buildGoPackage, fetchFromGitHub, libobjc, IOKit }: 2 2 3 3 buildGoPackage rec { 4 4 name = "go-ethereum-${version}"; 5 5 version = "1.7.0"; 6 6 goPackagePath = "github.com/ethereum/go-ethereum"; 7 + 8 + # Fix for usb-related segmentation faults on darwin 9 + propagatedBuildInputs = 10 + stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ]; 7 11 8 12 # Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 ) 9 13 hardeningDisable = [ "fortify" ];