Skip to content

Xev{d,e} drop lm#330842

Merged
jopejoe1 merged 2 commits intoNixOS:masterfrom
toonn:xev{d,e}-drop-lm
Jul 29, 2024
Merged

Xev{d,e} drop lm#330842
jopejoe1 merged 2 commits intoNixOS:masterfrom
toonn:xev{d,e}-drop-lm

Conversation

@toonn
Copy link
Contributor

@toonn toonn commented Jul 29, 2024

Description of changes

Add upstream patches that include linking libm into the shared library, mpeg5/xevd#70 and mpeg5/xeve#132. This allows us to drop passing -lm in CFLAGS, which should probably actually be in LDFLAGS.

These patches are mostly a nice-to-have for the Darwin PR but taking them now means the next version bump will just be removing the patches rather than remembering the -lm flag can be dropped.

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

@toonn toonn requested a review from jopejoe1 July 29, 2024 11:37
@toonn toonn mentioned this pull request Jul 29, 2024
13 tasks
@ofborg ofborg 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 Jul 29, 2024
Copy link
Member

@emilazy emilazy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

15 packages built:
  • ffmpeg_7-full
  • ffmpeg_7-full.bin
  • ffmpeg_7-full.data
  • ffmpeg_7-full.dev
  • ffmpeg_7-full.doc
  • ffmpeg_7-full.lib
  • ffmpeg_7-full.man
  • handbrake
  • nixpkgs-manual
  • xevd
  • xevd.dev
  • xevd.lib
  • xeve
  • xeve.dev
  • xeve.lib

Copy link
Member

@jopejoe1 jopejoe1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@jopejoe1 jopejoe1 merged commit d048b51 into NixOS:master Jul 29, 2024
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.

3 participants