summary refs log tree commit diff
path: root/pkgs/applications/office
diff options
context:
space:
mode:
authorK900 <me@0upti.me>2023-07-29 13:57:50 +0300
committerK900 <me@0upti.me>2023-08-15 22:11:39 +0300
commit6edd6f71c7a089e88e500243904ea76ef023930c (patch)
tree4ff57d72271b88c100d167c19f2214dd51518987 /pkgs/applications/office
parent4d0a76416f5ca0402bfe7fc3fcd52a6d36c660c3 (diff)
downloadnixpkgs-6edd6f71c7a089e88e500243904ea76ef023930c.tar
nixpkgs-6edd6f71c7a089e88e500243904ea76ef023930c.tar.gz
nixpkgs-6edd6f71c7a089e88e500243904ea76ef023930c.tar.bz2
nixpkgs-6edd6f71c7a089e88e500243904ea76ef023930c.tar.lz
nixpkgs-6edd6f71c7a089e88e500243904ea76ef023930c.tar.xz
nixpkgs-6edd6f71c7a089e88e500243904ea76ef023930c.tar.zst
nixpkgs-6edd6f71c7a089e88e500243904ea76ef023930c.zip
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/office')
-rw-r--r--pkgs/applications/office/PageEdit/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/office/PageEdit/default.nix b/pkgs/applications/office/PageEdit/default.nix
index b95eb6cb51e..858995c05fa 100644
--- a/pkgs/applications/office/PageEdit/default.nix
+++ b/pkgs/applications/office/PageEdit/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, qtsvg, qtwebengine, qttranslations, wrapQtAppsHook }:
+{ lib, stdenv, fetchFromGitHub, cmake, qtsvg, qtwebengine, wrapQtAppsHook, qttools }:
 
 stdenv.mkDerivation rec {
   pname = "pageedit";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     hash = "sha256-naoflFANeMwabbdrNL3+ndvEXYT4Yqf+Mo77HcCexHE=";
   };
 
-  nativeBuildInputs = [ cmake qttranslations wrapQtAppsHook ];
+  nativeBuildInputs = [ cmake wrapQtAppsHook qttools ];
   propagatedBuildInputs = [ qtsvg qtwebengine ];
   cmakeFlags = [ "-DINSTALL_BUNDLED_DICTS=0" ];