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

handbrake: 1.2.2 -> 1.3.0 #76112

Merged
merged 2 commits into from Dec 22, 2019
Merged

handbrake: 1.2.2 -> 1.3.0 #76112

merged 2 commits into from Dec 22, 2019

Conversation

@acowley
Copy link
Contributor

@acowley acowley commented Dec 20, 2019

This update is important as handbrake 1.2.2 no longer builds with
nixpkgs due to an unrelated update to pango-1.44.x as described
here.

Fixes #73399

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nix-review --run "nix-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

@acowley
Copy link
Contributor Author

@acowley acowley commented Dec 20, 2019

Thanks to @jtojnar for showing the way forward with this comment.

@acowley acowley force-pushed the acowley:handbrake-1.3.0 branch from d1a0a82 to 760dcc8 Dec 21, 2019
@acowley
Copy link
Contributor Author

@acowley acowley commented Dec 21, 2019

I've done things differently to possibly better insulate our changes to the upstream build.

@acowley acowley force-pushed the acowley:handbrake-1.3.0 branch 2 times, most recently from 3afde0e to 2c5cebb Dec 21, 2019
This update is important as handbrake 1.2.2 no longer builds with
nixpkgs due to an unrelated update to pango-1.44.x as described
[here](HandBrake/HandBrake#2226).

Fixes #73399
@acowley acowley force-pushed the acowley:handbrake-1.3.0 branch from 2c5cebb to d46f197 Dec 21, 2019
These were included by the handbrake build because they are used by external dependencies. In nixpkgs, we build those dependencies (e.g. codecs) separately, and so excise the check for these tools from the handbrake build.
@acowley acowley force-pushed the acowley:handbrake-1.3.0 branch from d46f197 to 7978601 Dec 21, 2019
Copy link
Contributor

@jtojnar jtojnar left a comment

LGTM, program starts.

Copy link
Contributor

@Lassulus Lassulus left a comment

tested with nix-review, seems to work, weird behavior when I try to open files

@Lassulus Lassulus merged commit c729a06 into NixOS:master Dec 22, 2019
15 checks passed
15 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
handbrake on aarch64-linux Success
Details
handbrake on x86_64-linux Success
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

3 participants
You can’t perform that action at this time.