From ceebedb1dbf3f52c0c932cf7bb907d47455cf4dd Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 13 Apr 2022 13:02:35 +0100 Subject: [PATCH] sampler: fix build with go 1.17 --- pkgs/applications/misc/sampler/default.nix | 12 ++++++++++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/sampler/default.nix b/pkgs/applications/misc/sampler/default.nix index a020b15eea3e..c668edc9a17b 100644 --- a/pkgs/applications/misc/sampler/default.nix +++ b/pkgs/applications/misc/sampler/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, darwin, libiconv, alsa-lib, stdenv }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch, darwin, libiconv, alsa-lib, stdenv }: buildGoModule rec { pname = "sampler"; @@ -11,7 +11,15 @@ buildGoModule rec { sha256 = "1lanighxhnn28dfzils7i55zgxbw2abd6y723mq7x9wg1aa2bd0z"; }; - vendorSha256 = "04nywhkil5xkipcibrp6vi63rfcvqgv7yxbxmmrhqys2cdxfvazv"; + patches = [ + # fix build with go 1.17 + (fetchpatch { + url = "https://github.com/sqshq/sampler/commit/97a4a0ebe396a780d62f50f112a99b27044e832b.patch"; + sha256 = "1czns7jc85mzdf1mg874jimls8x32l35x3lysxfgfah7cvvwznbk"; + }) + ]; + + vendorSha256 = "02cfzqadpsk2vkzsp7ciji9wisjza0yp35pw42q44navhbzcb4ji"; doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d3c4a80c9696..c25b9acb2950 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22531,9 +22531,7 @@ with pkgs; sambaFull = samba4Full; - sampler = callPackage ../applications/misc/sampler { - buildGoModule = buildGo116Module; - }; + sampler = callPackage ../applications/misc/sampler { }; shairplay = callPackage ../servers/shairplay { avahi = avahi-compat; };