tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
gnuplot: migrate to wxGTK32
Weijia Wang
3 years ago
444a2bc1
86872d31
+6
-3
2 changed files
expand all
collapse all
unified
split
pkgs
tools
graphics
gnuplot
default.nix
top-level
all-packages.nix
+3
-2
pkgs/tools/graphics/gnuplot/default.nix
···
8
8
, libXpm ? null
9
9
, libXaw ? null
10
10
, aquaterm ? false
11
11
-
, withWxGTK ? false, wxGTK ? null
11
11
+
, withWxGTK ? false, wxGTK32, Cocoa
12
12
, fontconfig ? null
13
13
, gnused ? null
14
14
, coreutils ? null
···
37
37
++ lib.optional withCaca libcaca
38
38
++ lib.optionals withX [ libX11 libXpm libXt libXaw ]
39
39
++ lib.optionals withQt [ qtbase qtsvg ]
40
40
-
++ lib.optional withWxGTK wxGTK;
40
40
+
++ lib.optional withWxGTK wxGTK32
41
41
+
++ lib.optional (withWxGTK && stdenv.isDarwin) Cocoa;
41
42
42
43
postPatch = ''
43
44
# lrelease is in qttools, not in qtbase.
+3
-1
pkgs/top-level/all-packages.nix
···
7192
7192
7193
7193
gnupg-pkcs11-scd = callPackage ../tools/security/gnupg-pkcs11-scd { };
7194
7194
7195
7195
-
gnuplot = libsForQt5.callPackage ../tools/graphics/gnuplot { };
7195
7195
+
gnuplot = libsForQt5.callPackage ../tools/graphics/gnuplot {
7196
7196
+
inherit (darwin.apple_sdk.frameworks) Cocoa;
7197
7197
+
};
7196
7198
7197
7199
gnuplot_qt = gnuplot.override { withQt = true; };
7198
7200