Qt: Do not require mkDerivation #71089

ttuegel · 2019-10-13T18:59:34Z

Motivation for this change

This removes the need to use a custom mkDerivation with Qt applications. For compatibility, it remains, but it doesn't do much besides include wrapQtAppsHook.

Things done

Notify maintainers

cc @

worldofpeace · 2019-10-13T20:31:22Z

@ttuegel By port #70691 you mean qtbase setup hook checks for the presence of wrapQtAppsHook?

ttuegel · 2019-10-14T10:51:50Z

By port #70691 you mean qtbase setup hook checks for the presence of wrapQtAppsHook?

@worldofpeace Something like that. I'm not sure what the best option is: check for presence, or include by default. I like the idea of doing the right thing by default (including wrapQtAppsHook), but I know that trying to be "magic" often makes things difficult to understand. On the other hand, it is always possible to set dontWrapQtApps to disable the magic.

nixos-discourse · 2020-01-24T00:11:44Z

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/wrapqtappshook-out-of-tree/5619/7

nixos-discourse · 2020-04-11T15:58:15Z

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/declarative-wrappers-another-idea/6661/1

doronbehar · 2020-10-07T15:48:18Z

How is the debug flag related to mkDerivation?

ttuegel · 2020-10-12T10:40:04Z

How is the debug flag related to mkDerivation?

We have to set certain CFLAGS in all dependencies, based on the debug flag.

worldofpeace

Let's try it out in staging

SuperSandro2000

Lets go to staging! 🎰

The qmake hook sets its own `CONFIG+=debug` or `CONFIG+=release` depending on how `qtbase` was built. We no longer rely on using the custom deriver for this feature.

jtojnar · 2021-01-02T02:57:41Z

pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh

+# Integration with CMake:
+# Set the CMake build type corresponding to how qtbase was built.
+if [ -n "@debug@" ]; then
+    cmakeFlags="${cmakeFlags-}${cmakeFlags:+ }-DCMAKE_BUILD_TYPE=Debug"


Maybe use cmakeBuildType instead?

👍 It is... possible that did not exist when this pull request was originally drafted. 😆

jtojnar · 2021-01-02T02:59:45Z

pkgs/development/libraries/qt-5/mkDerivation.nix

-      ++ [
-        ("-DCMAKE_BUILD_TYPE=" + (if debug then "Debug" else "Release"))
-      ];
-
    enableParallelBuilding = args.enableParallelBuilding or true;


This should be redundant as both cmake and qmake setup hooks already enable this by default.

ttuegel · 2021-01-03T17:36:36Z

I am closing this pull request because my branch is completely broken and I don't know why. I will re-open later.

ttuegel requested review from worldofpeace and FRidh October 13, 2019 18:59

ofborg bot added the 6.topic: qt/kde label Oct 13, 2019

ofborg bot requested review from periklis, qknight and bkchr October 13, 2019 19:12

ofborg bot added 11.by: package-maintainer 10.rebuild-darwin: 101-500 10.rebuild-linux: 501+ 10.rebuild-linux: 1001-2500 labels Oct 13, 2019

jtojnar mentioned this pull request Oct 13, 2019

Split pinentry flavors and enable udisks2 on install media again #71095

Merged

10 tasks

FRidh added the 2.status: work-in-progress label Oct 22, 2019

rnhmjoj mentioned this pull request Nov 10, 2019

monero: 0.14.1.2 -> 0.15.0.0 #73162

Merged

10 tasks

This was referenced Dec 11, 2019

hopper: fix libxml2 dynamic linking issue #75522

Merged

muse: Use wrapQtAppsHook #75405

Merged

doc/gnome: update wrapper args example, remove proliferated uses #75465

Merged

periklis removed their request for review February 19, 2020 18:32

jtojnar mentioned this pull request Mar 17, 2020

qmidiarp: init at 0.6.5 #82795

Merged

10 tasks

jtojnar mentioned this pull request Apr 22, 2020

Use qt5's mkDerivation in packages that otherwise crash #84673

Merged

10 tasks

ttuegel force-pushed the feature--staging--qt-no-mkDerivation branch from b6ac094 to f3a5148 Compare September 11, 2020 23:58

ofborg bot requested a review from periklis September 12, 2020 01:42

ttuegel force-pushed the feature--staging--qt-no-mkDerivation branch from f3a5148 to fcf74db Compare September 12, 2020 12:03

periklis removed their request for review September 14, 2020 06:55

FRidh requested a review from doronbehar October 7, 2020 15:44

veprbl mentioned this pull request Oct 10, 2020

Abort Qt builds that do not use a supported deriver #70691

Closed

10 tasks

worldofpeace approved these changes Oct 12, 2020

View reviewed changes

SuperSandro2000 approved these changes Nov 27, 2020

View reviewed changes

ttuegel added 3 commits December 31, 2020 19:10

qtbase: Set cmakeFlags in setupHook

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

GPG key ID: 4AEE18F83AFDEB23
Expired

Verified
Learn about vigilant mode

fd61be7

qtbase.setupHook: Set NIX_CFLAGS_COMPILE

da2c789

ttuegel force-pushed the feature--staging--qt-no-mkDerivation branch from fcf74db to c43b696 Compare January 1, 2021 01:14

ofborg bot requested a review from periklis January 1, 2021 01:24

ttuegel force-pushed the feature--staging--qt-no-mkDerivation branch from c43b696 to 00a1c6b Compare January 1, 2021 02:15

qtbase: run setup hook once only

812f779

ttuegel force-pushed the feature--staging--qt-no-mkDerivation branch from 00a1c6b to 812f779 Compare January 1, 2021 11:40

ttuegel added 5 commits January 1, 2021 07:48

fixup! qtbase: run setup hook once only

f43cca7

fixup! qtbase: run setup hook once only

c8f6260

fixup! qtbase: run setup hook once only

b868d93

fixup! qtbase: run setup hook once only

a8765d3

qtbase-setup-hook.sh: do not use cmakeFlags before it is set

2477972

jtojnar reviewed Jan 2, 2021

View reviewed changes

ttuegel added 5 commits January 1, 2021 21:33

qtbase-setup-hook.sh: use cmakeBuildType

1fa9370

qtbase-setup-hook.sh: do not use NIX_CFLAGS_COMPILE uninitialized

fa30df1

qtbase-setup-hook.sh: do not process paths multiple times

b43de62

qtbase-setup-hook.sh: try a different way to initialize array

e44c2e3

fixup! qtbase-setup-hook.sh: try a different way to initialize array

0b9b398

ttuegel closed this Jan 3, 2021

jtojnar referenced this pull request Jan 7, 2021

treewide: cmake buildInputs to nativeBuildInputs, minor cleanups

b04fc59

ttuegel mentioned this pull request Jan 9, 2021

Qt: Do not require mkDerivation #108888

Merged

10 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Qt: Do not require mkDerivation #71089

Qt: Do not require mkDerivation #71089

ttuegel commented Oct 13, 2019

worldofpeace commented Oct 13, 2019

ttuegel commented Oct 14, 2019

nixos-discourse commented Jan 24, 2020

nixos-discourse commented Apr 11, 2020

doronbehar commented Oct 7, 2020

ttuegel commented Oct 12, 2020

worldofpeace left a comment

SuperSandro2000 left a comment

jtojnar Jan 2, 2021

ttuegel Jan 2, 2021

jtojnar Jan 2, 2021

ttuegel commented Jan 3, 2021

Qt: Do not require mkDerivation #71089

Qt: Do not require mkDerivation #71089

Conversation

ttuegel commented Oct 13, 2019

Motivation for this change

Things done

Notify maintainers

worldofpeace commented Oct 13, 2019

ttuegel commented Oct 14, 2019

nixos-discourse commented Jan 24, 2020

nixos-discourse commented Apr 11, 2020

doronbehar commented Oct 7, 2020

ttuegel commented Oct 12, 2020

worldofpeace left a comment

Choose a reason for hiding this comment

SuperSandro2000 left a comment

Choose a reason for hiding this comment

jtojnar Jan 2, 2021

Choose a reason for hiding this comment

ttuegel Jan 2, 2021

Choose a reason for hiding this comment

jtojnar Jan 2, 2021

Choose a reason for hiding this comment

ttuegel commented Jan 3, 2021