cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

retext: properly wrap with wrapQtApp

Browse source
This commit is contained in:
ahiaao 2019-11-16 23:50:07 -08:00
parent d3ac0e987c
commit 145652462b
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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