Skip to content

eduke32: fix build by removing explicit header paths#198019

Merged
trofi merged 1 commit intoNixOS:masterfrom
trofi:eduke32-fix
Oct 27, 2022
Merged

eduke32: fix build by removing explicit header paths#198019
trofi merged 1 commit intoNixOS:masterfrom
trofi:eduke32-fix

Conversation

@trofi
Copy link
Contributor

@trofi trofi commented Oct 27, 2022

In #197798 (comment) we noticed that eduke32 fails to build as:

source/build/include/sdl_inc.h:17:12: fatal error: SDL2/SDL.h: No such file or directory
   17 | #  include <SDL2/SDL.h>
      |            ^~~~~~~~~~~~

It statred after #191724 where NIX_CFLAGS_COMPILE entries were cleaned up slightly.

This change works build failure around. But I think it's a good change: there should be no reason to set SDL2 offset via forced include paths.

Description of changes
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 22.11 Release Notes (or backporting 22.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

In NixOS#197798 (comment)
we noticed that `eduke32` fails to build as:

    source/build/include/sdl_inc.h:17:12: fatal error: SDL2/SDL.h: No such file or directory
       17 | #  include <SDL2/SDL.h>
          |            ^~~~~~~~~~~~

It statred after NixOS#191724 where
`NIX_CFLAGS_COMPILE` entries were cleaned up slightly.

This change works build failure around. But I think it's a good change:
there should be no reason to set SDL2 offset via forced include paths.
@trofi trofi mentioned this pull request Oct 27, 2022
13 tasks
@ofborg ofborg bot requested review from mikroskeem and svanderburg October 27, 2022 07:28
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Oct 27, 2022
@mikroskeem
Copy link
Member

Result of nixpkgs-review pr 198019 run on x86_64-linux 1

1 package built:
  • eduke32

Result of nixpkgs-review pr 198019 run on aarch64-darwin 1

1 package built:
  • eduke32

@trofi trofi merged commit bac254b into NixOS:master Oct 27, 2022
@trofi trofi deleted the eduke32-fix branch October 27, 2022 10:34
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-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants