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

qutebrowser: make gstreamer and pdfjs configurable #33074

Merged
merged 2 commits into from Jan 2, 2018
Merged

Conversation

rnhmjoj
Copy link
Contributor

@rnhmjoj rnhmjoj commented Dec 26, 2017

Motivation for this change

PDF.js and gstreamer are optional dependencies in other distros.
I added two options to control these but kept the same behavior by default.
Also a small refactor.

Things done
  • Tested using sandboxing (nix.useSandbox on 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 nox
  • Tested execution of all binary files
  • Fits CONTRIBUTING.md.

@grahamc
Copy link
Member

grahamc commented Dec 26, 2017

@GrahamcOfBorg eval

(sorry, an issue was introduced in to master which has since been fixed, really)

@rnhmjoj
Copy link
Contributor Author

rnhmjoj commented Dec 26, 2017

I rebased the branch

, gst-plugins-good ? null
, gst-plugins-bad ? null
, gst-plugins-ugly ? null
, gst-libav ? null
Copy link
Member

Choose a reason for hiding this comment

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

No need for these to be ? null I think?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I meant to add an assert !=null. I just gave a look at all-packages.nix: the package is called with arguments inherit (gst_all_1) [...] (and the same for python packages) so they are always defined? Is it good practice or should I remove it and use gst_all_1 inside the expression?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

If it's ok I'll squash the commits.

@grahamc grahamc merged commit 25b7008 into NixOS:master Jan 2, 2018
@rnhmjoj rnhmjoj deleted the qute branch January 22, 2018 19:06
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

3 participants