Merge pull request #108888 from ttuegel/feature--staging--qt-no-mkDerivation
Qt: Do not require mkDerivation
This commit is contained in:
@@ -22,6 +22,7 @@
|
||||
libGL,
|
||||
buildExamples ? false,
|
||||
buildTests ? false,
|
||||
debug ? false,
|
||||
developerBuild ? false,
|
||||
decryptSslTraffic ? false
|
||||
}:
|
||||
@@ -33,12 +34,14 @@ let
|
||||
compareVersion = v: builtins.compareVersions version v;
|
||||
qmakeCacheName =
|
||||
if compareVersion "5.12.4" < 0 then ".qmake.cache" else ".qmake.stash";
|
||||
debugSymbols = debug || developerBuild;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
||||
name = "qtbase-${version}";
|
||||
inherit qtCompatVersion src version;
|
||||
debug = debugSymbols;
|
||||
|
||||
propagatedBuildInputs =
|
||||
[
|
||||
@@ -241,6 +244,7 @@ stdenv.mkDerivation {
|
||||
"-I" "${icu.dev}/include"
|
||||
"-pch"
|
||||
]
|
||||
++ lib.optional debugSymbols "-debug"
|
||||
++ lib.optionals (compareVersion "5.11.0" < 0)
|
||||
[
|
||||
"-qml-debug"
|
||||
@@ -397,6 +401,8 @@ stdenv.mkDerivation {
|
||||
-e "/^host_bins=/ c host_bins=$dev/bin"
|
||||
'';
|
||||
|
||||
dontStrip = debugSymbols;
|
||||
|
||||
setupHook = ../hooks/qtbase-setup-hook.sh;
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
Reference in New Issue
Block a user