diff options
| author | Nikolay Korotkiy <sikmir@gmail.com> | 2020-06-01 11:45:46 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-01 08:45:46 +0000 |
| commit | d5117e795f65df28f26d55ce08784538882235db (patch) | |
| tree | b8b9d98bb522b6b92361a3c5df50bd4a7bd6f44d /pkgs/applications | |
| parent | ab327b27a1d42c8f2fbfe3e174891e695050d738 (diff) | |
gpxsee: 7.29 -> 7.30 (#89290)
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/misc/gpxsee/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/applications/misc/gpxsee/fix-qttranslations-path.diff | 18 |
2 files changed, 31 insertions, 3 deletions
diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index c519bf63e0935..b3dbecb56b1b8 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -1,18 +1,28 @@ -{ stdenv, mkDerivation, fetchFromGitHub, qmake, qttools }: +{ stdenv, mkDerivation, fetchFromGitHub, qmake, qttools, qttranslations }: mkDerivation rec { pname = "gpxsee"; - version = "7.29"; + version = "7.30"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "sha256-OTKyxEu7RZZy3JBHTM7YoH+G4lhoRfb1INLtQEKC5p4="; + sha256 = "09gajwqc30r9a2sn972qdx3gx0gki9n0zafq986hn6zsr3z43mfs"; }; + patches = [ + # See https://github.com/NixOS/nixpkgs/issues/86054 + ./fix-qttranslations-path.diff + ]; + nativeBuildInputs = [ qmake qttools ]; + postPatch = '' + substituteInPlace src/GUI/app.cpp \ + --subst-var-by qttranslations ${qttranslations} + ''; + preConfigure = '' lrelease gpxsee.pro ''; diff --git a/pkgs/applications/misc/gpxsee/fix-qttranslations-path.diff b/pkgs/applications/misc/gpxsee/fix-qttranslations-path.diff new file mode 100644 index 0000000000000..3b546338d209d --- /dev/null +++ b/pkgs/applications/misc/gpxsee/fix-qttranslations-path.diff @@ -0,0 +1,18 @@ +diff --git i/src/GUI/app.cpp w/src/GUI/app.cpp +index 10e84d5..1e0abbe 100644 +--- i/src/GUI/app.cpp ++++ w/src/GUI/app.cpp +@@ -34,11 +34,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) + qt->load(QLocale::system(), "qt", "_", ProgramPaths::translationsDir()); + #else // Q_OS_WIN32 || Q_OS_MAC +- qt->load(QLocale::system(), "qt", "_", QLibraryInfo::location( +- QLibraryInfo::TranslationsPath)); ++ qt->load(QLocale::system(), "qt", "_", QLatin1String("@qttranslations@/translations")); + #endif // Q_OS_WIN32 || Q_OS_MAC + installTranslator(qt); + |