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.

Sign up for GitHub

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

Jump to bottom

avidemux: fix build with glibc 2.27 #38815

Merged
merged 1 commit into from Apr 13, 2018
Merged

avidemux: fix build with glibc 2.27 #38815

merged 1 commit into from Apr 13, 2018

Conversation

pbogdan
Copy link
Member

@pbogdan pbogdan commented Apr 11, 2018

Motivation for this change

Doesn't build with glibc 2.27.

/cc @abbradar @Ma27

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: avidemux

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: avidemux

Partial log (click to expand)

shrinking /nix/store/28r772hv696ixldi96bvq04b3fyac2pc-avidemux-2.7.0/lib64/libADM_coreAudioDevice6.so
shrinking /nix/store/28r772hv696ixldi96bvq04b3fyac2pc-avidemux-2.7.0/bin/.avidemux3_cli-wrapped
shrinking /nix/store/28r772hv696ixldi96bvq04b3fyac2pc-avidemux-2.7.0/bin/.avidemux3_qt5-wrapped
shrinking /nix/store/28r772hv696ixldi96bvq04b3fyac2pc-avidemux-2.7.0/bin/.avidemux3_jobs_qt5-wrapped
strip is /nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/28r772hv696ixldi96bvq04b3fyac2pc-avidemux-2.7.0/lib64  /nix/store/28r772hv696ixldi96bvq04b3fyac2pc-avidemux-2.7.0/bin
patching script interpreter paths in /nix/store/28r772hv696ixldi96bvq04b3fyac2pc-avidemux-2.7.0
checking for references to /tmp/nix-build-avidemux-2.7.0.drv-0 in /nix/store/28r772hv696ixldi96bvq04b3fyac2pc-avidemux-2.7.0...
moving /nix/store/28r772hv696ixldi96bvq04b3fyac2pc-avidemux-2.7.0/lib64/* to /nix/store/28r772hv696ixldi96bvq04b3fyac2pc-avidemux-2.7.0/lib
/nix/store/28r772hv696ixldi96bvq04b3fyac2pc-avidemux-2.7.0

Ma27
Ma27 reviewed Apr 12, 2018
View reviewed changes
Copy link
Member

@Ma27 Ma27 left a comment

Choose a reason for hiding this comment

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

First of all thanks a lot for fixing this, I only have one question: rather than using substituteInPlace (which isn't IMO that obvious to reason about changes in the code itself) shouldn't we use the patch from some kind of upstream source (such as using mean00/avidemux2@afdd9c4 with fetchpatch?)

@pbogdan
Copy link
Member Author

pbogdan commented Apr 12, 2018

As it was just a single occurrence I admit I didn't think about looking for a patch.. But if a patch is available then I agree that would be preferable, amended the commit accordingly. Thanks for the feedback!

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: avidemux

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: avidemux

Partial log (click to expand)

shrinking /nix/store/4b5plhlnijzlmr0yg2imvr90innxwflk-avidemux-2.7.0/lib64/libADM_coreAudioDevice6.so
shrinking /nix/store/4b5plhlnijzlmr0yg2imvr90innxwflk-avidemux-2.7.0/bin/.avidemux3_cli-wrapped
shrinking /nix/store/4b5plhlnijzlmr0yg2imvr90innxwflk-avidemux-2.7.0/bin/.avidemux3_qt5-wrapped
shrinking /nix/store/4b5plhlnijzlmr0yg2imvr90innxwflk-avidemux-2.7.0/bin/.avidemux3_jobs_qt5-wrapped
strip is /nix/store/j75dgadrff2d1fyc4fczmcgqkid2imdx-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/4b5plhlnijzlmr0yg2imvr90innxwflk-avidemux-2.7.0/lib64  /nix/store/4b5plhlnijzlmr0yg2imvr90innxwflk-avidemux-2.7.0/bin
patching script interpreter paths in /nix/store/4b5plhlnijzlmr0yg2imvr90innxwflk-avidemux-2.7.0
checking for references to /tmp/nix-build-avidemux-2.7.0.drv-0 in /nix/store/4b5plhlnijzlmr0yg2imvr90innxwflk-avidemux-2.7.0...
moving /nix/store/4b5plhlnijzlmr0yg2imvr90innxwflk-avidemux-2.7.0/lib64/* to /nix/store/4b5plhlnijzlmr0yg2imvr90innxwflk-avidemux-2.7.0/lib
/nix/store/4b5plhlnijzlmr0yg2imvr90innxwflk-avidemux-2.7.0

@Ma27
Copy link
Member

Ma27 commented Apr 12, 2018

as @GrahamcOfBorg seems to be happy with the patch, I guess that we could just merge it, right? (/cc @abbradar you're one of the avidemuxmaintainers with push acces ;-) )

@abbradar
Copy link
Member

Thanks!

@abbradar abbradar merged commit 8ce62f5 into NixOS:master Apr 13, 2018
@pbogdan pbogdan deleted the avidemux-glibc-2.27 branch December 3, 2019 17:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ma27 Ma27 Ma27 left review comments

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@pbogdan @GrahamcOfBorg @Ma27 @abbradar