summary refs log tree commit diff
diff options
context:
space:
mode:
authorNick Cao <nickcao@nichi.co>2023-04-14 19:08:07 +0800
committerNick Cao <nickcao@nichi.co>2023-04-14 19:30:02 +0800
commita1a3813f7bdb163139f6b74a9892108013b869a3 (patch)
tree0d04396df057ddbbd75dd67cb7d601fa3ecaf4c4
parent0bad2288a751fc4023da1cf70902a2847100616d (diff)
downloadnixpkgs-a1a3813f7bdb163139f6b74a9892108013b869a3.tar
nixpkgs-a1a3813f7bdb163139f6b74a9892108013b869a3.tar.gz
nixpkgs-a1a3813f7bdb163139f6b74a9892108013b869a3.tar.bz2
nixpkgs-a1a3813f7bdb163139f6b74a9892108013b869a3.tar.lz
nixpkgs-a1a3813f7bdb163139f6b74a9892108013b869a3.tar.xz
nixpkgs-a1a3813f7bdb163139f6b74a9892108013b869a3.tar.zst
nixpkgs-a1a3813f7bdb163139f6b74a9892108013b869a3.zip
qt6: drop devTools attribute as they are no longer moved to the dev output
-rw-r--r--pkgs/development/libraries/qt-6/modules/qtbase.nix26
-rw-r--r--pkgs/development/libraries/qt-6/modules/qtdeclarative.nix12
-rw-r--r--pkgs/development/libraries/qt-6/modules/qttools.nix24
3 files changed, 0 insertions, 62 deletions
diff --git a/pkgs/development/libraries/qt-6/modules/qtbase.nix b/pkgs/development/libraries/qt-6/modules/qtbase.nix
index 9e22ae67c60..f82d2193a38 100644
--- a/pkgs/development/libraries/qt-6/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtbase.nix
@@ -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 = ''
diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix b/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix
index e720abd3d60..d78a886109a 100644
--- a/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix
@@ -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"
-  ];
 }
diff --git a/pkgs/development/libraries/qt-6/modules/qttools.nix b/pkgs/development/libraries/qt-6/modules/qttools.nix
index 441e080653b..42bf495134a 100644
--- a/pkgs/development/libraries/qt-6/modules/qttools.nix
+++ b/pkgs/development/libraries/qt-6/modules/qttools.nix
@@ -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"