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

obs-studio: apply fix for fdk-aac v2.0.0 #53008

Merged
merged 2 commits into from Jan 4, 2019

Conversation

nyanloutre
Copy link
Member

@nyanloutre nyanloutre commented Dec 28, 2018

Motivation for this change

Patch from pull request obsproject/obs-studio#1557

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.

Copy link
Member

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

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

LGTM as it fixes compilation 👼
But patches sha256 needs to be updated 👼

patches = [
(fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/obsproject/obs-studio/pull/1557.diff";
sha256 = "0xq3sh1g8j58mpa4ryi9agqqpr41prrzagxmqafkbgfv6fjv3h0c";
Copy link
Member

Choose a reason for hiding this comment

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

I'm guessing the patch has changed :

fixed-output derivation produced path '/nix/store/ij8k22jgavc1nzjvj4hy72av4iwlfswg-1557.diff' with sha256 hash '162fnkxh2wyn6wrrm1kzv7c2mn96kx35vlmk2qwn1nqlifbpsfyq' instead of the expected hash '0xq3sh1g8j58mpa4ryi9agqqpr41prrzagxmqafkbgfv6fjv3h0c'

Copy link
Member Author

@nyanloutre nyanloutre Jan 4, 2019

Choose a reason for hiding this comment

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

This is strange:

➜ nix-prefetch-url https://patch-diff.githubusercontent.com/raw/obsproject/obs-studio/pull/1557.diff
path is '/nix/store/raqc9k54zjgmxn7lwqmn0ycyhnjsr179-1557.diff'
0xq3sh1g8j58mpa4ryi9agqqpr41prrzagxmqafkbgfv6fjv3h0c

I think there might be some difference between how nix-prefetch-url and fetchpatch compute their hashes.

Answer is that fetchpatch is normalizing the patch (and change the resulting hash): https://github.com/NixOS/nixpkgs/blob/b27b443e145863b5b7f502d8beccb6767572f3c3/pkgs/build-support/fetchpatch/default.nix

Copy link
Member

Choose a reason for hiding this comment

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

@nyanloutre 🤔 interesting 😅

vdemeester added a commit to vdemeester/home that referenced this pull request Jan 4, 2019
… waiting for NixOS/nixpkgs#53008 to get merged.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
@globin globin merged commit b245c0c into NixOS:master Jan 4, 2019
@nyanloutre nyanloutre deleted the obs-studio-fix branch January 4, 2019 14:04
@nyanloutre nyanloutre restored the obs-studio-fix branch January 6, 2019 10:28
@nyanloutre nyanloutre deleted the obs-studio-fix branch January 6, 2019 10:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants