about summary refs log tree commit diff
path: root/nixpkgs/pkgs/applications/misc/valentina
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/applications/misc/valentina')
-rw-r--r--nixpkgs/pkgs/applications/misc/valentina/default.nix10
-rw-r--r--nixpkgs/pkgs/applications/misc/valentina/fix-qttranslations-path.patch37
2 files changed, 2 insertions, 45 deletions
diff --git a/nixpkgs/pkgs/applications/misc/valentina/default.nix b/nixpkgs/pkgs/applications/misc/valentina/default.nix
index f5cd55c534c3..c00159c0c64d 100644
--- a/nixpkgs/pkgs/applications/misc/valentina/default.nix
+++ b/nixpkgs/pkgs/applications/misc/valentina/default.nix
@@ -1,6 +1,6 @@
-{ lib, stdenv, fetchFromGitLab, substituteAll, installShellFiles
+{ lib, stdenv, fetchFromGitLab, installShellFiles
 , qmake, qttools
-, qtsvg, qttranslations, qtxmlpatterns
+, qtsvg, qtxmlpatterns
 , wrapQtAppsHook
 }:
 
@@ -15,12 +15,6 @@ stdenv.mkDerivation rec {
     hash = "sha256-N9fC2tCP4TVNncatHaz5W5Mp3jOmAcEWYCl30+0myaE=";
   };
 
-  patches = (substituteAll {
-    # See https://github.com/NixOS/nixpkgs/issues/86054
-    src = ./fix-qttranslations-path.patch;
-    inherit qttranslations;
-  });
-
   postPatch = ''
     substituteInPlace src/app/translations.pri \
       --replace '$$[QT_INSTALL_BINS]/$$LRELEASE' '${lib.getDev qttools}/bin/lrelease'
diff --git a/nixpkgs/pkgs/applications/misc/valentina/fix-qttranslations-path.patch b/nixpkgs/pkgs/applications/misc/valentina/fix-qttranslations-path.patch
deleted file mode 100644
index de3fe05cc8b0..000000000000
--- a/nixpkgs/pkgs/applications/misc/valentina/fix-qttranslations-path.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git i/src/libs/vmisc/vabstractapplication.cpp w/src/libs/vmisc/vabstractapplication.cpp
-index b64817bab..5f9aa3518 100644
---- i/src/libs/vmisc/vabstractapplication.cpp
-+++ w/src/libs/vmisc/vabstractapplication.cpp
-@@ -221,26 +221,26 @@ void VAbstractApplication::LoadTranslation(const QString &locale)
-     ClearTranslation();
- 
-     qtTranslator = new QTranslator(this);
--#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
-+#if defined(Q_OS_WIN)
-     qtTranslator->load("qt_" + locale, translationsPath(locale));
- #else
--    qtTranslator->load("qt_" + locale, QLibraryInfo::location(QLibraryInfo::TranslationsPath));
-+    qtTranslator->load("qt_" + locale, QLatin1String("@qttranslations@/translations"));
- #endif
-     installTranslator(qtTranslator);
- 
-     qtxmlTranslator = new QTranslator(this);
--#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
-+#if defined(Q_OS_WIN)
-     qtxmlTranslator->load("qtxmlpatterns_" + locale, translationsPath(locale));
- #else
--    qtxmlTranslator->load("qtxmlpatterns_" + locale, QLibraryInfo::location(QLibraryInfo::TranslationsPath));
-+    qtxmlTranslator->load("qtxmlpatterns_" + locale, QLatin1String("@qttranslations@/translations"));
- #endif
-     installTranslator(qtxmlTranslator);
- 
-     qtBaseTranslator = new QTranslator(this);
--#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
-+#if defined(Q_OS_WIN)
-     qtBaseTranslator->load("qtbase_" + locale, translationsPath(locale));
- #else
--    qtBaseTranslator->load("qtbase_" + locale, QLibraryInfo::location(QLibraryInfo::TranslationsPath));
-+    qtBaseTranslator->load("qtbase_" + locale, QLatin1String("@qttranslations@/translations"));
- #endif
-     installTranslator(qtBaseTranslator);
-