From 03db75cc7f3526fd7b78356005711cb13b3e2f2d Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 23 Dec 2024 16:58:16 +0000 Subject: [PATCH] innoextract: fix the build against boost-1.86 Without the change the build fails as https://hydra.nixos.org/build/281983567/nixlog/3: /build/innoextract-1.9/src/stream/slice.cpp: In member function 'bool stream::slice_reader::open_file_case_insensitive(const path_type&, const path_type&)': /build/innoextract-1.9/src/stream/slice.cpp:162:28: error: 'directory_iterator' is not a member of 'boost::filesystem'; did you mean 'directory_entry'? 162 | boost::filesystem::directory_iterator end; | ^~~~~~~~~~~~~~~~~~ | directory_entry --- pkgs/by-name/in/innoextract/package.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/by-name/in/innoextract/package.nix b/pkgs/by-name/in/innoextract/package.nix index 34bd0f083c9f..6e145f31300c 100644 --- a/pkgs/by-name/in/innoextract/package.nix +++ b/pkgs/by-name/in/innoextract/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, cmake, makeWrapper, boost, @@ -20,6 +21,16 @@ stdenv.mkDerivation rec { sha256 = "09l1z1nbl6ijqqwszdwch9mqr54qb7df0wp2sd77v17dq6gsci33"; }; + patches = [ + # Fix boost-1.86 build: + # https://github.com/dscharrer/innoextract/pull/169 + (fetchpatch { + name = "boost-1.86.patch"; + url = "https://github.com/dscharrer/innoextract/commit/264c2fe6b84f90f6290c670e5f676660ec7b2387.patch"; + hash = "sha256-QYwrqLXC7FE4oYi6G1erpX/RUUtS5zNBv7/fO7AdZQg="; + }) + ]; + buildInputs = [ xz boost