diff options
| author | K900 <me@0upti.me> | 2023-07-29 13:57:50 +0300 |
|---|---|---|
| committer | K900 <me@0upti.me> | 2023-08-15 22:11:39 +0300 |
| commit | 6edd6f71c7a089e88e500243904ea76ef023930c (patch) | |
| tree | 4ff57d72271b88c100d167c19f2214dd51518987 /pkgs/applications/misc/gpxsee | |
| parent | 4d0a76416f5ca0402bfe7fc3fcd52a6d36c660c3 (diff) | |
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.
Diffstat (limited to 'pkgs/applications/misc/gpxsee')
| -rw-r--r-- | pkgs/applications/misc/gpxsee/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/misc/gpxsee/fix-qttranslations-path.diff | 18 |
2 files changed, 0 insertions, 26 deletions
diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 694323df82d94..c08deed34db06 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -3,10 +3,8 @@ , fetchFromGitHub , qmake , nix-update-script -, substituteAll , qtbase , qttools -, qttranslations , qtlocation ? null # qt5 only , qtpositioning ? null # qt6 only , qtpbfimageplugin @@ -31,12 +29,6 @@ stdenv.mkDerivation rec { hash = "sha256-Zf2eyDx5QK69W6HNz/IGGHkX2qCDnxYsU8KLCgU9teY="; }; - patches = (substituteAll { - # See https://github.com/NixOS/nixpkgs/issues/86054 - src = ./fix-qttranslations-path.diff; - inherit qttranslations; - }); - buildInputs = [ qtpbfimageplugin qtserialport ] ++ (if isQt6 then [ qtbase diff --git a/pkgs/applications/misc/gpxsee/fix-qttranslations-path.diff b/pkgs/applications/misc/gpxsee/fix-qttranslations-path.diff deleted file mode 100644 index 757d9b8c65714..0000000000000 --- a/pkgs/applications/misc/gpxsee/fix-qttranslations-path.diff +++ /dev/null @@ -1,18 +0,0 @@ -diff --git i/src/GUI/app.cpp w/src/GUI/app.cpp -index 37e9d3f..d4a065c 100644 ---- i/src/GUI/app.cpp -+++ w/src/GUI/app.cpp -@@ -35,11 +35,10 @@ App::App(int &argc, char **argv) : QApplication(argc, argv) - installTranslator(gpxsee); - - QTranslator *qt = new QTranslator(this); --#if defined(Q_OS_WIN32) || defined(Q_OS_MAC) -+#if defined(Q_OS_WIN32) - if (qt->load(QLocale::system(), "qt", "_", ProgramPaths::translationsDir())) - #else // Q_OS_WIN32 || Q_OS_MAC -- if (qt->load(QLocale::system(), "qt", "_", QLibraryInfo::location( -- QLibraryInfo::TranslationsPath))) -+ if (qt->load(QLocale::system(), "qt", "_", QLatin1String("@qttranslations@/translations"))) - #endif // Q_OS_WIN32 || Q_OS_MAC - installTranslator(qt); - |