Skip to content

innoextract: fix the build against boost-1.86#367699

Merged
philiptaron merged 1 commit intoNixOS:masterfrom
trofi:innoextract-fix-boost-build
Dec 24, 2024
Merged

innoextract: fix the build against boost-1.86#367699
philiptaron merged 1 commit intoNixOS:masterfrom
trofi:innoextract-fix-boost-build

Conversation

@trofi
Copy link
Contributor

@trofi trofi commented Dec 23, 2024

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

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

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
@trofi trofi mentioned this pull request Dec 23, 2024
13 tasks
@github-actions github-actions bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Dec 23, 2024
@philiptaron philiptaron merged commit f1f275a into NixOS:master Dec 24, 2024
@trofi trofi deleted the innoextract-fix-boost-build branch December 24, 2024 06:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants