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

Qt: Do not require mkDerivation
2021-01-26 16:24:41 -06:00
parent a3b529a460 13e3ec0d58
commit 0e418a1a18
116 changed files with 343 additions and 70 deletions
@@ -38,6 +38,8 @@ stdenv.mkDerivation rec {
    sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt
  '';

+  dontWrapQtApps = true;
+
  cmakeFlags = [
    (mkFlag true "UNSTABLE_API_ABI_HEADERS") # previously "XPDF_HEADERS"
    (mkFlag (!minimal) "GLIB")