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

qt5: Add qtnetworkauth submodule #28480

Merged
merged 1 commit into from
Nov 11, 2017
Merged

qt5: Add qtnetworkauth submodule #28480

merged 1 commit into from
Nov 11, 2017

Conversation

ilpianista
Copy link
Contributor

Motivation for this change

Add QtNetworkAuth module available since Qt 5.8.

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.

qtSubmodule {
name = "qtnetworkauth";
qtInputs = [ qtbase ];
outputs = [ "out" "dev" "bin" ];
Copy link
Member

Choose a reason for hiding this comment

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

@ilpianista As is, the build does not produce any QML outputs. If that is correct, please remove the bin output and the postInstall hook below. If the build should produce QML outputs, add qtdeclarative to the qtInputs.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@ttuegel It doesn't produce any QML output. Fixed, thanks!

@ttuegel ttuegel merged commit 1e9edbf into NixOS:master Nov 11, 2017
@grahamc
Copy link
Member

grahamc commented Nov 11, 2017

$ nix-env --file . -qa
error: anonymous function at pkgs/development/libraries/qt-5/5.9/qtnetworkauth.nix:1:1 called without required argument ‘qtSubmodule’, at lib/customisation.nix:74:12

@grahamc
Copy link
Member

grahamc commented Nov 11, 2017

@ttuegel it seems merging this has broken the eval

@vcunat
Copy link
Member

vcunat commented Nov 11, 2017

Reverted now.

@ilpianista
Copy link
Contributor Author

Indeed, fe0ab94 refactored all qt5 packages and then this is broken now. Unfortunately I'm not using NixOS anymore at the moment, so I'll not update this PR.

Thanks anyway!

@ilpianista ilpianista deleted the qt5 branch November 12, 2017 12:23
@ttuegel
Copy link
Member

ttuegel commented Nov 12, 2017

Indeed, fe0ab94 refactored all qt5 packages and then this is broken now.

Sorry, I foolishly assumed that Git would report a merge conflict if there was a problem with the refactoring. Somehow I always seem to find trivial conflicts need to be manually resolved, while Git "automatically" resolves non-trivial conflicts badly.

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

6 participants