Merge pull request #200339 from viraptor/butler-darwin

Changed files
+19 -2
pkgs
games
itch
top-level
+16 -1
pkgs/games/itch/butler.nix
···
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
···
sha256 = "sha256-vciSmXR3wI3KcnC+Uz36AgI/WUfztA05MJv1InuOjJM=";
};
proxyVendor = true;
-
vendorSha256 = "sha256-EIl0ZFDKbZopUR22hp5a2vRUu0O1h1O953NrtoNa2x8=";
doCheck = false;
···
{ lib
, buildGoModule
, fetchFromGitHub
+
, stdenv
+
, Cocoa
+
, fetchpatch
}:
buildGoModule rec {
···
sha256 = "sha256-vciSmXR3wI3KcnC+Uz36AgI/WUfztA05MJv1InuOjJM=";
};
+
buildInputs = lib.optionals stdenv.isDarwin [
+
Cocoa
+
];
+
+
patches = [
+
# update x/sys dependency for darwin build https://github.com/itchio/butler/pull/245
+
(fetchpatch {
+
url = "https://github.com/itchio/butler/pull/245/commits/ef651d373e3061fda9692dd44ae0f7ce215e9655.patch";
+
hash = "sha256-rZZn/OGiv3mRyy89uORyJ99zWN21kZCCQAlFvSKxlPU=";
+
})
+
];
+
proxyVendor = true;
+
vendorSha256 = "sha256-CtBwc5mcgLvl2Bvg5gI+ULJMQEEibx1aN3IpmRNUtwE=";
doCheck = false;
+3 -1
pkgs/top-level/all-packages.nix
···
asleap = callPackage ../tools/networking/asleap { };
-
butler = callPackage ../games/itch/butler.nix { };
cf-vault = callPackage ../tools/admin/cf-vault { };
···
asleap = callPackage ../tools/networking/asleap { };
+
butler = callPackage ../games/itch/butler.nix {
+
inherit (darwin.apple_sdk.frameworks) Cocoa;
+
};
cf-vault = callPackage ../tools/admin/cf-vault { };