Merge pull request #73539 from ahiaao/fix/retext-wrap-qt

retext: properly wrap with wrapQtApp
This commit is contained in:
Florian Klink 2019-11-17 14:12:25 +01:00 committed by GitHub
commit 3372d65468
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions

View File

@ -1,4 +1,4 @@
{ stdenv, python3, fetchFromGitHub, makeWrapper, buildEnv, aspellDicts
{ stdenv, python3, fetchFromGitHub, wrapQtAppsHook, buildEnv, aspellDicts
# Use `lib.collect lib.isDerivation aspellDicts;` to make all dictionaries
# available.
, enchantAspellDicts ? with aspellDicts; [ en en-computers en-science ]
@ -42,12 +42,11 @@ in python.pkgs.buildPythonApplication {
doCheck = false;
nativeBuildInputs = [ makeWrapper ];
nativeBuildInputs = [ wrapQtAppsHook ];
propagatedBuildInputs = [ pythonEnv ];
postInstall = ''
mv $out/bin/retext $out/bin/.retext
makeWrapper "$out/bin/.retext" "$out/bin/retext" \
wrapQtApp "$out/bin/retext" \
--set ASPELL_CONF "dict-dir ${buildEnv {
name = "aspell-all-dicts";
paths = map (path: "${path}/lib/aspell") enchantAspellDicts;

View File

@ -5946,7 +5946,7 @@ in
redsocks = callPackage ../tools/networking/redsocks { };
retext = callPackage ../applications/editors/retext { };
retext = libsForQt5.callPackage ../applications/editors/retext { };
richgo = callPackage ../development/tools/richgo { };