Merge pull request #108888 from ttuegel/feature--staging--qt-no-mkDerivation

Qt: Do not require mkDerivation
This commit is contained in:
Thomas Tuegel
2021-01-26 16:24:41 -06:00
committed by GitHub
116 changed files with 343 additions and 70 deletions
@@ -38,6 +38,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
dontWrapQtApps = true;
doCheck = true;
preCheck = ''
patchShebangs testo
+2
View File
@@ -10,6 +10,8 @@ mkDerivation {
nativeBuildInputs = [ qmake qttools ];
buildInputs = [ qtwebkit ];
dontWrapQtApps = true;
postPatch = ''
substituteInPlace mainwindow.cc \
--replace "QApplication::applicationDirPath() + \"/" "\"" \