treewide: clean up all qttranslations workarounds

There are two kinds of changes here:
- removing explicit qttranslations path hardcoding from applications that were patched to do it
- replacing qttranslations in buildInputs with qttools for packages that really depend on the latter

After this, qttranslation is never used outside Qt itself, as it should.

4 files changed, 2 insertions, 104 deletions

diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix
index b73fb71f698..9722c3cb4de 100644
--- a/pkgs/applications/gis/openorienteering-mapper/default.nix
+++ b/pkgs/applications/gis/openorienteering-mapper/default.nix
@@ -14,8 +14,6 @@
 , qtlocation
 , qtsensors
 , qttools
-, qttranslations
-, substituteAll
 , zlib
 }:
 
@@ -31,11 +29,6 @@ mkDerivation rec {
   };
 
   patches = [
-    # https://github.com/NixOS/nixpkgs/issues/86054
-    (substituteAll {
-      src = ./fix-qttranslations-path.diff;
-      inherit qttranslations;
-    })
     # https://github.com/OpenOrienteering/mapper/pull/1907
     (fetchpatch {
       url = "https://github.com/OpenOrienteering/mapper/commit/bc52aa567e90a58d6963b44d5ae1909f3f841508.patch";
diff --git a/pkgs/applications/gis/openorienteering-mapper/fix-qttranslations-path.diff b/pkgs/applications/gis/openorienteering-mapper/fix-qttranslations-path.diff
deleted file mode 100644
index 06c465a8fb3..00000000000
--- a/pkgs/applications/gis/openorienteering-mapper/fix-qttranslations-path.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git i/src/util/translation_util.cpp w/src/util/translation_util.cpp
-index da03d216..c1f12751 100644
---- i/src/util/translation_util.cpp
-+++ w/src/util/translation_util.cpp
-@@ -103,7 +103,7 @@ TranslationUtil::TranslationUtil(const QString& code, QString translation_file)
- 	}
- 	
- 	QString translation_name = QLatin1String("qt_") + language.code;
--	if (!qt_translator.load(translation_name, QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
-+	if (!qt_translator.load(translation_name, QLatin1String("@qttranslations@/translations")))
- 		load(qt_translator, translation_name);
- 	
- 	load(app_translator, translation_file);
diff --git a/pkgs/applications/gis/qmapshack/default.nix b/pkgs/applications/gis/qmapshack/default.nix
index 2665e74ed39..3460f60d2b6 100644
--- a/pkgs/applications/gis/qmapshack/default.nix
+++ b/pkgs/applications/gis/qmapshack/default.nix
@@ -1,5 +1,5 @@
-{ lib, stdenv, fetchFromGitHub, cmake, substituteAll, wrapQtAppsHook
-, qtscript, qttranslations, qtwebengine, gdal, proj, routino, quazip }:
+{ lib, stdenv, fetchFromGitHub, cmake, wrapQtAppsHook
+, qtscript, qtwebengine, gdal, proj, routino, quazip }:
 
 stdenv.mkDerivation rec {
   pname = "qmapshack";
@@ -12,14 +12,6 @@ stdenv.mkDerivation rec {
     hash = "sha256-qG/fiR2J5wQZaR+xvBGjdp3L7viqki2ktkzBUf6fZi8=";
   };
 
-  patches = [
-    # See https://github.com/NixOS/nixpkgs/issues/86054
-    (substituteAll {
-      src = ./fix-qttranslations-path.patch;
-      inherit qttranslations;
-    })
-  ];
-
   nativeBuildInputs = [ cmake wrapQtAppsHook ];
 
   buildInputs = [ qtscript qtwebengine gdal proj routino quazip ];
diff --git a/pkgs/applications/gis/qmapshack/fix-qttranslations-path.patch b/pkgs/applications/gis/qmapshack/fix-qttranslations-path.patch
deleted file mode 100644
index 9f05611f5a2..00000000000
--- a/pkgs/applications/gis/qmapshack/fix-qttranslations-path.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff --git i/src/qmapshack/setup/CAppSetupLinux.cpp w/src/qmapshack/setup/CAppSetupLinux.cpp
-index 7581ef32..26eba3c8 100644
---- i/src/qmapshack/setup/CAppSetupLinux.cpp
-+++ w/src/qmapshack/setup/CAppSetupLinux.cpp
-@@ -30,7 +30,7 @@ void CAppSetupLinux::initQMapShack() {
-   prepareGdal("", "");
- 
-   // setup translators
--  QString resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
-+  QLatin1String resourceDir = QLatin1String("@qttranslations@/translations");
-   QString translationPath = QCoreApplication::applicationDirPath();
-   translationPath.replace(QRegExp("bin$"), "share/qmapshack/translations");
-   prepareTranslator(resourceDir, "qt_");
-diff --git i/src/qmapshack/setup/CAppSetupMac.cpp w/src/qmapshack/setup/CAppSetupMac.cpp
-index 37602802..ae4a5a23 100644
---- i/src/qmapshack/setup/CAppSetupMac.cpp
-+++ w/src/qmapshack/setup/CAppSetupMac.cpp
-@@ -56,7 +56,7 @@ void CAppSetupMac::initQMapShack() {
- 
-   // setup translators
-   QString translationPath = getApplicationDir(relTranslationDir).absolutePath();
--  prepareTranslator(translationPath, "qt_");
-+  prepareTranslator(QLatin1String("@qttranslations@/translations"), "qt_");
-   prepareTranslator(translationPath, "qmapshack_");
- 
-   // load and apply style sheet
-diff --git i/src/qmaptool/setup/CAppSetupLinux.cpp w/src/qmaptool/setup/CAppSetupLinux.cpp
-index b703e7bb..637d653e 100644
---- i/src/qmaptool/setup/CAppSetupLinux.cpp
-+++ w/src/qmaptool/setup/CAppSetupLinux.cpp
-@@ -29,7 +29,7 @@ void CAppSetupLinux::initQMapTool() {
-   prepareGdal("", "");
- 
-   // setup translators
--  QString resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
-+  QLatin1String resourceDir = QLatin1String("@qttranslations@/translations");
-   QString translationPath = QCoreApplication::applicationDirPath();
-   translationPath.replace(QRegExp("bin$"), "share/qmaptool/translations");
-   prepareTranslator(resourceDir, "qt_");
-diff --git i/src/qmaptool/setup/CAppSetupMac.cpp w/src/qmaptool/setup/CAppSetupMac.cpp
-index dd68b9c1..84351cf4 100644
---- i/src/qmaptool/setup/CAppSetupMac.cpp
-+++ w/src/qmaptool/setup/CAppSetupMac.cpp
-@@ -57,7 +57,7 @@ void CAppSetupMac::initQMapTool() {
- 
-   // setup translators
-   QString translationPath = getApplicationDir(relTranslationDir).absolutePath();
--  prepareTranslator(translationPath, "qt_");
-+  prepareTranslator(QLatin1String("@qttranslations@/translations"), "qt_");
-   prepareTranslator(translationPath, "qmaptool_");
- 
-   migrateDirContent(defaultCachePath());
-diff --git i/src/qmt_rgb2pct/main.cpp w/src/qmt_rgb2pct/main.cpp
-index 589d3d52..5f7c12f8 100644
---- i/src/qmt_rgb2pct/main.cpp
-+++ w/src/qmt_rgb2pct/main.cpp
-@@ -47,7 +47,7 @@ static void prepareTranslator(QString translationPath, QString translationPrefix
- static void loadTranslations() {
- #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(__FreeBSD_kernel__) || defined(__GNU__) || \
-     defined(Q_OS_CYGWIN)
--  QString resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
-+  QLatin1String resourceDir = QLatin1String("@qttranslations@/translations");
-   QString translationPath = QCoreApplication::applicationDirPath();
-   translationPath.replace(QRegExp("bin$"), "share/" APP_STR "/translations");
-   prepareTranslator(resourceDir, "qt_");
-@@ -58,7 +58,7 @@ static void loadTranslations() {
-   // os x
-   static QString relTranslationDir = "Resources/translations";  // app
-   QString translationPath = getApplicationDir(relTranslationDir).absolutePath();
--  prepareTranslator(translationPath, "qt_");
-+  prepareTranslator(QLatin1String("@qttranslations@/translations"), "qt_");
-   prepareTranslator(translationPath, APP_STR "_");
- #endif
-