diff options
| author | Tomo <68489118+tomodachi94@users.noreply.github.com> | 2024-05-03 08:00:02 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-03 15:00:02 +0000 |
| commit | b8a958101b0268408d2b34926b16e4583af53a4b (patch) | |
| tree | 2849fd74c506f3849d5ed81a07bfceaf1f2b4332 | |
| parent | c693a5d411445ec06fbf3b7b97632152f5fa43a0 (diff) | |
sanjuuni: fix build (#308706)
I mistakenly asked for a patch to be included in 404317c27011331e16f071d1ae62ea662d5b3cf0, and it didn't end up applying cleanly. This PR fixes the patching by excluding the problematic file from the patch (`configure`), and then using autoreconfHook to regenerate `configure`.
| -rw-r--r-- | pkgs/tools/graphics/sanjuuni/default.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/tools/graphics/sanjuuni/default.nix b/pkgs/tools/graphics/sanjuuni/default.nix index 70bc59f3eb40..41cfd6f7ee57 100644 --- a/pkgs/tools/graphics/sanjuuni/default.nix +++ b/pkgs/tools/graphics/sanjuuni/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , fetchpatch , pkg-config +, autoreconfHook , ffmpeg , poco , ocl-icd @@ -24,12 +25,14 @@ stdenv.mkDerivation rec { (fetchpatch { name = "build-with-cxx17.patch"; url = "https://github.com/MCJack123/sanjuuni/commit/f2164bc18935bcf63ee5b0a82087bc91f7fd258d.patch"; - hash = "sha256-ZmP+AmUV7fcIFqSA6e56Nt6u03leE9PX36g2z0nLswo="; + hash = "sha256-MjDeAiB3WkemCRYzgOHzHlbPUoI4DHEYe28xIIC+c7I="; + excludes = [ "configure" ]; # conflicts with release tarball; we manually regenerate this }) ]; nativeBuildInputs = [ pkg-config + autoreconfHook ]; buildInputs = [ |