Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ffmpeg_4-full: disable glslang #267700

Merged
merged 1 commit into from
Nov 15, 2023
Merged

Conversation

Atemu
Copy link
Member

@Atemu Atemu commented Nov 15, 2023

abd83e2 broke glslang support in ffmpeg_4. It's only enabled in ffmepg-full and v4 is only kept for compat reasons, so let's simply disable this feature.

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.

abd83e2 broke glslang support in ffmpeg_4. It's
only enabled in ffmepg-full and v4 is only kept for compat reasons, so let's
simply disable this feature.
@Atemu Atemu requested a review from K900 November 15, 2023 16:47
Copy link
Member

@vcunat vcunat left a comment

Choose a reason for hiding this comment

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

OK, why not.

@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Nov 15, 2023
@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Nov 15, 2023
@NickCao
Copy link
Member

NickCao commented Nov 15, 2023

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

7 packages built:
  • ffmpeg_4-full
  • ffmpeg_4-full.bin
  • ffmpeg_4-full.data
  • ffmpeg_4-full.dev
  • ffmpeg_4-full.doc
  • ffmpeg_4-full.lib
  • ffmpeg_4-full.man

@NickCao NickCao merged commit 1181aa7 into NixOS:staging-next Nov 15, 2023
29 checks passed
@Atemu Atemu deleted the fix/ffmpeg_4-full branch November 16, 2023 08:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 11.by: package-maintainer This PR was created by the maintainer of the package it changes 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants