Skip to content

haskellPackages: work around sdl2 pkg-config issues#265678

Merged
cdepillabout merged 6 commits intoNixOS:haskell-updatesfrom
sternenseemann:haskell-sdl2-pkg-config-workarounds
Nov 10, 2023
Merged

haskellPackages: work around sdl2 pkg-config issues#265678
cdepillabout merged 6 commits intoNixOS:haskell-updatesfrom
sternenseemann:haskell-sdl2-pkg-config-workarounds

Conversation

@sternenseemann
Copy link
Copy Markdown
Member

@sternenseemann sternenseemann commented Nov 5, 2023 •
edited
Loading

Description of changes

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/)
  • 23.11 Release Notes (or backporting 23.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.

@sternenseemann
haskellPackages.sdl2-gfx: work around sdl2 pkg-config issue
0ee702c 
Ref NixOS#260863.
@sternenseemann
harfbuzz: record provided pkg-config modules in meta
73c05bd 
This is verified using testers.hasPkgConfigModules which leads to a
slight refactor of the expression.
@sternenseemann
sdl2: record provided pkg-config modules in meta
d32cb37 
This is verified using testers.hasPkgConfigModules which leads to a
slight refactor of the expression.
@sternenseemann
SDL2_gfx: record provided pkg-config modules in meta
e323502 
This is verified using testers.hasPkgConfigModules which leads to a
slight refactor of the expression.
@sternenseemann
SDL2_ttf: record provided pkg-config modules in meta
4c56be2 
This is verified using testers.hasPkgConfigModules which leads to a
slight refactor of the expression.
@sternenseemann
haskellPackages.sdl2-ttf: work around sdl2 pkg-config issue
c31f006 
Ref NixOS#260863.
@github-actions github-actions bot added the 6.topic: haskell General-purpose, statically typed, purely functional programming language label Nov 5, 2023
This was referenced Nov 5, 2023
Closed
Closed
@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 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. labels Nov 5, 2023
@cdepillabout cdepillabout merged commit f10a9c9 into NixOS:haskell-updates Nov 10, 2023
@cdepillabout
Copy link
Copy Markdown
Member

cdepillabout commented Nov 10, 2023

Thanks, this LGTM!

I manually fixed the merge conflict and merged this is as f10a9c9.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cdepillabout cdepillabout Awaiting requested review from cdepillabout

@maralorn maralorn Awaiting requested review from maralorn

Assignees

No one assigned

Labels

6.topic: haskell General-purpose, statically typed, purely functional programming language 8.has: package (new) This PR adds a new package 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.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@sternenseemann @cdepillabout