colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sanjuuni: fix build (#308706)

Browse Source 
I mistakenly asked for a patch to be included in 404317c270,
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`.
This commit is contained in:
Tomo 2024-05-03 08:00:02 -07:00 committed by GitHub
parent c693a5d411
commit b8a958101b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/tools/graphics/sanjuuni/default.nix
View File

@ -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 = [