Skip to content

Commit 03db75c

Browse files
committed
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
1 parent 4345398 commit 03db75c

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

pkgs/by-name/in/innoextract/package.nix

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
lib,
33
stdenv,
44
fetchurl,
5+
fetchpatch,
56
cmake,
67
makeWrapper,
78
boost,
@@ -20,6 +21,16 @@ stdenv.mkDerivation rec {
2021
sha256 = "09l1z1nbl6ijqqwszdwch9mqr54qb7df0wp2sd77v17dq6gsci33";
2122
};
2223

24+
patches = [
25+
# Fix boost-1.86 build:
26+
# https://github.com/dscharrer/innoextract/pull/169
27+
(fetchpatch {
28+
name = "boost-1.86.patch";
29+
url = "https://github.com/dscharrer/innoextract/commit/264c2fe6b84f90f6290c670e5f676660ec7b2387.patch";
30+
hash = "sha256-QYwrqLXC7FE4oYi6G1erpX/RUUtS5zNBv7/fO7AdZQg=";
31+
})
32+
];
33+
2334
buildInputs = [
2435
xz
2536
boost

0 commit comments

Comments
 (0)