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

libaom: create shared libraries, fix version reported in aom.pc #52443

Merged
merged 2 commits into from Dec 28, 2018
Merged

libaom: create shared libraries, fix version reported in aom.pc #52443

merged 2 commits into from Dec 28, 2018

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Dec 17, 2018

See added comment for explanation of version fix.

Motivation for this change
  • Shared: match nixpkgs preference, happened to notice while
    investigating version problem
  • Version: without this fix packages that require aom 1.0.0
    will incorrectly be told only 0.1.0 is available--
    I ran into this putting together ffmpeg upgrades.
    (will submit shortly)
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@dtzWill
libaom: create shared libraries, fix version reported in aom.pc
cee81d5 
See added comment for explanation of version fix.
Mic92
Mic92 reviewed Dec 17, 2018
View reviewed changes
pkgs/development/libraries/libaom/default.nix Outdated
# than this comment, so while yes this is a bit gross
# adding these 4 lines here does the job without
# a huge patch in spirit of preferring upstream's fix
# instead of `sed -i 's/v0\.1\.0/v1.0.0/g' aom.pc` or so.
Copy link
Member

Choose a reason for hiding this comment

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

There build is pretty much over-engineered.
As simple ./create-relase 1.x that replaces a few strings would have also done the job.

@Mic92
libaom: use git stub instead of patching changelog
1720abc 
It probably needs less maintenance.
@dtzWill
Copy link
Member Author

dtzWill commented Dec 19, 2018

Thanks, appreciate the cleanup-- I admit I was a little frustrated with how it was possible such a mess (GAH hehe) by the time I submitted this 😇 .

Doesn't really matter, but perhaps dummyGit should be created with whatever helper function we have for such (writeScriptBin?) and added to nativeBuildInputs -- so as to further simplify? If that doesn't seem worthwhile, I'm good with this without the change so however you'd like :).

(or just let me know)

Thanks!

@dtzWill dtzWill mentioned this pull request Dec 19, 2018
Merged
10 tasks
@Mic92
Copy link
Member

Mic92 commented Dec 19, 2018

I also thought about having a fake-git that ignores git-pull, fails on git-clone and generates the right output for some git commands such as git-describe according to environment variables i.e. FAKE_GIT_VERSION. I think it is worth to have such a wrapper, I just didn't wanted to procrastinate in that direction back then.

@dtzWill
Copy link
Member Author

dtzWill commented Dec 22, 2018

This look okay? Not sure if darwin situation is new or not?

@MP2E
Copy link

MP2E commented Dec 27, 2018

LGTM, been running this commit along with the ffmpeg 4.1 update for a few days, I haven't seen any issues (on NixOS, can't speak for Darwin)

@dtzWill
Copy link
Member Author

dtzWill commented Dec 28, 2018

Been running it successfully here as well, let's do this! Thanks!

@dtzWill dtzWill merged commit 19894ad into NixOS:master Dec 28, 2018
@dtzWill dtzWill deleted the fix/aom-version-and-shared branch December 28, 2018 19:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Mic92 left review comments

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 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
@dtzWill @Mic92 @MP2E @GrahamcOfBorg