pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #200339 from viraptor/butler-darwin

authored by Martin Weinelt and committed by GitHub 1514d1dc 79eed604

+19 -2
unified split
+16 -1
pkgs/games/itch/butler.nix
··· 1 { lib 2 , buildGoModule 3 , fetchFromGitHub 4 }: 5 6 buildGoModule rec { ··· 14 sha256 = "sha256-vciSmXR3wI3KcnC+Uz36AgI/WUfztA05MJv1InuOjJM="; 15 }; 16 17 proxyVendor = true; 18 19 - vendorSha256 = "sha256-EIl0ZFDKbZopUR22hp5a2vRUu0O1h1O953NrtoNa2x8="; 20 21 doCheck = false; 22
··· 1 { lib 2 , buildGoModule 3 , fetchFromGitHub 4 + , stdenv 5 + , Cocoa 6 + , fetchpatch 7 }: 8 9 buildGoModule rec { ··· 17 sha256 = "sha256-vciSmXR3wI3KcnC+Uz36AgI/WUfztA05MJv1InuOjJM="; 18 }; 19 20 + buildInputs = lib.optionals stdenv.isDarwin [ 21 + Cocoa 22 + ]; 23 + 24 + patches = [ 25 + # update x/sys dependency for darwin build https://github.com/itchio/butler/pull/245 26 + (fetchpatch { 27 + url = "https://github.com/itchio/butler/pull/245/commits/ef651d373e3061fda9692dd44ae0f7ce215e9655.patch"; 28 + hash = "sha256-rZZn/OGiv3mRyy89uORyJ99zWN21kZCCQAlFvSKxlPU="; 29 + }) 30 + ]; 31 + 32 proxyVendor = true; 33 34 + vendorSha256 = "sha256-CtBwc5mcgLvl2Bvg5gI+ULJMQEEibx1aN3IpmRNUtwE="; 35 36 doCheck = false; 37
+3 -1
pkgs/top-level/all-packages.nix
··· 1285 1286 asleap = callPackage ../tools/networking/asleap { }; 1287 1288 - butler = callPackage ../games/itch/butler.nix { }; 1289 1290 cf-vault = callPackage ../tools/admin/cf-vault { }; 1291
··· 1285 1286 asleap = callPackage ../tools/networking/asleap { }; 1287 1288 + butler = callPackage ../games/itch/butler.nix { 1289 + inherit (darwin.apple_sdk.frameworks) Cocoa; 1290 + }; 1291 1292 cf-vault = callPackage ../tools/admin/cf-vault { }; 1293