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

qbittorrent: 3.3.15 -> 3.3.16, drop patch, enable parallel build #29971

Merged
merged 1 commit into from
Oct 1, 2017

Conversation

lukateras
Copy link
Member

Motivation for this change

Patch doesn't apply anymore, upstream has changed the patched file heavily, and now patching isn't required to build the program:

https://github.com/qbittorrent/qBittorrent/blob/master/qm_gen.pri#L7-L13

I've built it in parallel with -j8, so hopefully the same will apply to -j50 builds.
See: qbittorrent/qBittorrent#1992

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
    • Linux
  • 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.

@lukateras lukateras force-pushed the qbittorrent/3.3.16 branch 2 times, most recently from 704b7b2 to d89c925 Compare September 30, 2017 23:48
patches = [ ./fix-lrelease.patch ];

# https://github.com/qbittorrent/qBittorrent/issues/1992
enableParallelBuilding = false;
Copy link
Contributor

Choose a reason for hiding this comment

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

Parallel building is disabled by default, you have to set it to true to enable.

@orivej orivej merged commit 5de2cff into NixOS:master Oct 1, 2017
@lukateras lukateras deleted the qbittorrent/3.3.16 branch October 1, 2017 00:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants