From 145652462b9f89a29094f6b2b1e4c1faa2935c2e Mon Sep 17 00:00:00 2001 From: ahiaao Date: Sat, 16 Nov 2019 23:50:07 -0800 Subject: [PATCH] retext: properly wrap with wrapQtApp --- pkgs/applications/editors/retext/default.nix | 7 +++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/retext/default.nix b/pkgs/applications/editors/retext/default.nix index 31b75c71820..e9742389261 100644 --- a/pkgs/applications/editors/retext/default.nix +++ b/pkgs/applications/editors/retext/default.nix @@ -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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24902dcc5dc..6840e62bfc4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };