philipp
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

retext: Fix build by using default qt5.15. 

Bonus: Set `makeWrapperArgs` instead of calling `wrapQtApp` - to prevent
double wrapping.
gstqt5
Doron Behar 2020-10-08 01:47:20 +03:00 committed by Frederik Rietdijk
parent 2d238fc6b0
commit 198e025172
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/editors/retext/default.nix
View File

@ -46,11 +46,13 @@ in python.pkgs.buildPythonApplication {
propagatedBuildInputs = [ pythonEnv ];
postInstall = ''
wrapQtApp "$out/bin/retext" \
--set ASPELL_CONF "dict-dir ${buildEnv {
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
makeWrapperArgs+=(
"--set" "ASPELL_CONF" "dict-dir ${buildEnv {
name = "aspell-all-dicts";
paths = map (path: "${path}/lib/aspell") enchantAspellDicts;
}}"
)
'';
meta = with stdenv.lib; {

2
pkgs/top-level/all-packages.nix
View File

@ -6595,7 +6595,7 @@ in
reredirect = callPackage ../tools/misc/reredirect { };
retext = libsForQt514.callPackage ../applications/editors/retext { };
retext = libsForQt5.callPackage ../applications/editors/retext { };
richgo = callPackage ../development/tools/richgo { };