Skip to content

pulseview,pavucontrol-qt: use qt5.mkDerivation#65366

Closed
delroth wants to merge 1 commit intoNixOS:masterfrom
delroth:missing-wrapqt
Closed

pulseview,pavucontrol-qt: use qt5.mkDerivation#65366
delroth wants to merge 1 commit intoNixOS:masterfrom
delroth:missing-wrapqt

Conversation

@delroth
Copy link
Copy Markdown
Contributor

@delroth delroth commented Jul 25, 2019

Motivation for this change

I've noticed both of these apps don't start anymore due to missing Qt plugin path.

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

@delroth
Copy link
Copy Markdown
Contributor Author

delroth commented Jul 25, 2019

(@ttuegel)

@ofborg ofborg bot requested review from bjornfor and romildo July 25, 2019 11:26
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jul 25, 2019
Copy link
Copy Markdown
Contributor

@bjornfor bjornfor left a comment

Choose a reason for hiding this comment

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

Please add "I've noticed both of these apps don't start anymore due to missing Qt plugin path." or something to the commit message (the why part).

@worldofpeace
Copy link
Copy Markdown
Contributor

@ttuegel Would it be possible to open a tracking issue so people to explain to people how then can easily migrate to the qt wrappers?

The influx of PRs like this is going to be large, so it would be easy to track if each one opened would reference that single issue also.

The apps currently do not start because of a missing QT_PLUGIN_PATH.
@delroth
Copy link
Copy Markdown
Contributor Author

delroth commented Jul 25, 2019

Addressed both comments.

@delroth delroth changed the title pulseview,pavucontrol-qt: add wrapQtAppsHook pulseview,pavucontrol-qt: use qt5.mkDerivation Jul 26, 2019
@ofborg ofborg bot requested a review from bjornfor July 26, 2019 00:07
@bjornfor
Copy link
Copy Markdown
Contributor

I'm now a bit confused whether expressions should use the qt5 package set directly or not, see #65399 (comment).

But anyway, please split the commit in two, one for each package you're updating.

@bjornfor
Copy link
Copy Markdown
Contributor

No more confusion, this is how to do it: #65399 (comment).

{ stdenv, fetchurl, pkgconfig, cmake, glib, boost, libsigrok
, libsigrokdecode, libserialport, libzip, udev, libusb1, libftdi1, glibmm
, pcre, librevisa, python3, qtbase, qtsvg
, pcre, librevisa, python3, qt5, qtbase, qtsvg
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
, pcre, librevisa, python3, qt5, qtbase, qtsvg
, pcre, librevisa, python3, mkDerivation, qtbase, qtsvg

}:

stdenv.mkDerivation rec {
qt5.mkDerivation rec {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
qt5.mkDerivation rec {
mkDerivation rec {

@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt, libpulseaudio,
pcre, qtbase, qttools, qtx11extras }:
pcre, qt5, qtbase, qttools, qtx11extras }:
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
pcre, qt5, qtbase, qttools, qtx11extras }:
pcre, mkDerivation, qtbase, qttools, qtx11extras }:

pcre, qt5, qtbase, qttools, qtx11extras }:

stdenv.mkDerivation rec {
qt5.mkDerivation rec {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
qt5.mkDerivation rec {
mkDerivation rec {

@worldofpeace
Copy link
Copy Markdown
Contributor

We should never use qt* directly.

@bjornfor
Copy link
Copy Markdown
Contributor

@bjornfor said 3 weeks ago:
But anyway, please split the commit in two, one for each package you're updating.

In the meantime I merged #66869, since it had pulseview/single package as a separate commit. Please rebase.

@delroth delroth closed this Sep 8, 2019
@delroth delroth deleted the missing-wrapqt branch September 8, 2019 00:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants