From a2332386df7415d048f8291c75d25e65868efa91 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 30 Apr 2023 20:28:44 +0300 Subject: [PATCH] gnuplot-qt: fix wrapper --- pkgs/tools/graphics/gnuplot/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 5f96eb9f8d22..c95ec79534eb 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -53,11 +53,18 @@ in CXXFLAGS = lib.optionalString (stdenv.isDarwin && withQt) "-std=c++11"; + # we'll wrap things ourselves + dontWrapGApps = true; + dontWrapQtApps = true; + + # binary wrappers don't support --run postInstall = lib.optionalString withX '' - wrapProgram $out/bin/gnuplot \ + wrapProgramShell $out/bin/gnuplot \ --prefix PATH : '${gnused}/bin' \ --prefix PATH : '${coreutils}/bin' \ --prefix PATH : '${fontconfig.bin}/bin' \ + "''${gappsWrapperArgs[@]}" \ + "''${qtWrapperArgs[@]}" \ --run '. ${./set-gdfontpath-from-fontconfig.sh}' '';