From 444a2bc17437a12a443b83df8797fc659795c672 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 14 Oct 2022 06:46:56 +0200 Subject: [PATCH] gnuplot: migrate to wxGTK32 --- pkgs/tools/graphics/gnuplot/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index bcb464d375e1..a82b18c8562d 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -8,7 +8,7 @@ , libXpm ? null , libXaw ? null , aquaterm ? false -, withWxGTK ? false, wxGTK ? null +, withWxGTK ? false, wxGTK32, Cocoa , fontconfig ? null , gnused ? null , coreutils ? null @@ -37,7 +37,8 @@ in ++ lib.optional withCaca libcaca ++ lib.optionals withX [ libX11 libXpm libXt libXaw ] ++ lib.optionals withQt [ qtbase qtsvg ] - ++ lib.optional withWxGTK wxGTK; + ++ lib.optional withWxGTK wxGTK32 + ++ lib.optional (withWxGTK && stdenv.isDarwin) Cocoa; postPatch = '' # lrelease is in qttools, not in qtbase. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2feb82460f3d..5650cf7b2c3a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7192,7 +7192,9 @@ with pkgs; gnupg-pkcs11-scd = callPackage ../tools/security/gnupg-pkcs11-scd { }; - gnuplot = libsForQt5.callPackage ../tools/graphics/gnuplot { }; + gnuplot = libsForQt5.callPackage ../tools/graphics/gnuplot { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; gnuplot_qt = gnuplot.override { withQt = true; };