Unverified Commit b8a95810 authored by Tomodachi94's avatar Tomodachi94 Committed by GitHub
Browse files

sanjuuni: fix build (#308706) 

I mistakenly asked for a patch to be included in 404317c2,
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`.
parent c693a5d4

pkgs/tools/graphics/sanjuuni/default.nix

+4 −1
Original line number Diff line number Diff line
@@ -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 = [