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

qt6.qttools: fix embedded path to tools

parent 37e3fafb

pkgs/development/libraries/qt-6/modules/qttools.nix

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ qtModule { 
    ../patches/qttools-paths.patch

  ];

  env.NIX_CFLAGS_COMPILE = toString [

    "-DNIX_OUTPUT_DEV=\"${placeholder "dev"}\""

    "-DNIX_OUTPUT_OUT=\"${placeholder "out"}\""

  ];



  devTools = [

pkgs/development/libraries/qt-6/patches/qttools-paths.patch

+2 −2
Original line number Diff line number Diff line
@@ -10,9 +10,9 @@ index d355b9dc..94fef33f 100644 
+{

+  switch (location) {

+    case QLibraryInfo::BinariesPath:

+      return QLatin1String(NIX_OUTPUT_DEV) + QLatin1String("/bin");

+      return QLatin1String(NIX_OUTPUT_OUT) + QLatin1String("/bin");

+    case QLibraryInfo::LibraryExecutablesPath:

+      return QLatin1String(NIX_OUTPUT_DEV) + QLatin1String("/libexec");

+      return QLatin1String(NIX_OUTPUT_OUT) + QLatin1String("/libexec");

+    default:

+      return QLibraryInfo::path(location);

+  }