diff options
| author | Doron Behar <doron.behar@gmail.com> | 2020-10-08 01:47:20 +0300 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-10-08 18:57:23 +0200 |
| commit | 198e025172ec7b96cce9057030b3b8fd3f061e45 (patch) | |
| tree | bafff929c4a0d84b7ed80de2a0cb1e55a53ad82a | |
| parent | 2d238fc6b0db021b2fef793419d7ad057bd0240c (diff) | |
| download | nixpkgs-198e025172ec7b96cce9057030b3b8fd3f061e45.tar nixpkgs-198e025172ec7b96cce9057030b3b8fd3f061e45.tar.gz nixpkgs-198e025172ec7b96cce9057030b3b8fd3f061e45.tar.bz2 nixpkgs-198e025172ec7b96cce9057030b3b8fd3f061e45.tar.lz nixpkgs-198e025172ec7b96cce9057030b3b8fd3f061e45.tar.xz nixpkgs-198e025172ec7b96cce9057030b3b8fd3f061e45.tar.zst nixpkgs-198e025172ec7b96cce9057030b3b8fd3f061e45.zip | |
retext: Fix build by using default qt5.15.
Bonus: Set `makeWrapperArgs` instead of calling `wrapQtApp` - to prevent double wrapping.
| -rw-r--r-- | pkgs/applications/editors/retext/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/applications/editors/retext/default.nix b/pkgs/applications/editors/retext/default.nix index 7752313b2a7..c32e8315756 100644 --- a/pkgs/applications/editors/retext/default.nix +++ b/pkgs/applications/editors/retext/default.nix @@ -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; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ddf655dcc5b..603d0828afc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |