Unverified Commit a1a3813f authored by Nick Cao's avatar Nick Cao
Browse files

qt6: drop devTools attribute as they are no longer moved to the dev output

parent 0bad2288
Loading
Loading
Loading
Loading
+0 −26
Original line number Diff line number Diff line
@@ -232,32 +232,6 @@ stdenv.mkDerivation rec {

  outputs = [ "out" "dev" ];

  devTools = [
    "libexec/moc"
    "libexec/rcc"
    "libexec/syncqt.pl"
    "libexec/qlalr"
    "libexec/ensure_pro_file.cmake"
    "libexec/cmake_automoc_parser"
    "libexec/qvkgen"
    "libexec/tracegen"
    "libexec/uic"
    "bin/fixqt4headers.pl"
    "bin/moc"
    "bin/qdbuscpp2xml"
    "bin/qdbusxml2cpp"
    "bin/qlalr"
    "bin/qmake"
    "bin/qmake6"
    "bin/qt-cmake"
    "bin/qt-cmake-private"
    "bin/qt-cmake-private-install.cmake"
    "bin/qt-cmake-standalone-test"
    "bin/rcc"
    "bin/syncqt.pl"
    "bin/uic"
  ];

  moveToDev = false;

  postFixup = ''
+0 −12
Original line number Diff line number Diff line
@@ -14,16 +14,4 @@ qtModule {
    # prevent headaches from stale qmlcache data
    ../patches/qtdeclarative-default-disable-qmlcache.patch
  ];
  devTools = [
    "bin/qml"
    "bin/qmlcachegen"
    "bin/qmleasing"
    "bin/qmlimportscanner"
    "bin/qmllint"
    "bin/qmlmin"
    "bin/qmlplugindump"
    "bin/qmlprofiler"
    "bin/qmlscene"
    "bin/qmltestrunner"
  ];
}
+0 −24
Original line number Diff line number Diff line
@@ -17,30 +17,6 @@ qtModule {
  env.NIX_CFLAGS_COMPILE = toString [
    "-DNIX_OUTPUT_OUT=\"${placeholder "out"}\""
  ];

  devTools = [
    "bin/qcollectiongenerator"
    "bin/linguist"
    "bin/assistant"
    "bin/qdoc"
    "bin/lconvert"
    "bin/designer"
    "bin/qtattributionsscanner"
    "bin/lrelease"
    "bin/lrelease-pro"
    "bin/pixeltool"
    "bin/lupdate"
    "bin/lupdate-pro"
    "bin/qtdiag"
    "bin/qhelpgenerator"
    "bin/qtplugininfo"
    "bin/qthelpconverter"
    "bin/lprodump"
    "bin/qdistancefieldgenerator"
  ] ++ lib.optionals stdenv.isDarwin [
    "bin/macdeployqt"
  ];

  postInstall = ''
    mkdir -p "$dev"
    ln -s "$out/bin" "$dev/bin"