alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #195910 from wegank/gnuplot-wxgtk

Browse source
This commit is contained in:
Sandro 2022-11-04 01:20:04 +01:00 committed by GitHub
parent e9a81267e6 444a2bc174
commit 136fc9565e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/tools/graphics/gnuplot/default.nix
View file

@ -8,7 +8,7 @@
, libXpm ? null , libXpm ? null
, libXaw ? null , libXaw ? null
, aquaterm ? false , aquaterm ? false
, withWxGTK ? false, wxGTK ? null , withWxGTK ? false, wxGTK32, Cocoa
, fontconfig ? null , fontconfig ? null
, gnused ? null , gnused ? null
, coreutils ? null , coreutils ? null
@ -37,7 +37,8 @@ in
++ lib.optional withCaca libcaca ++ lib.optional withCaca libcaca
++ lib.optionals withX [ libX11 libXpm libXt libXaw ] ++ lib.optionals withX [ libX11 libXpm libXt libXaw ]
++ lib.optionals withQt [ qtbase qtsvg ] ++ lib.optionals withQt [ qtbase qtsvg ]
++ lib.optional withWxGTK wxGTK; ++ lib.optional withWxGTK wxGTK32
++ lib.optional (withWxGTK && stdenv.isDarwin) Cocoa;
postPatch = '' postPatch = ''
# lrelease is in qttools, not in qtbase. # lrelease is in qttools, not in qtbase.

4
pkgs/top-level/all-packages.nix
View file

@ -7319,7 +7319,9 @@ with pkgs;
gnupg-pkcs11-scd = callPackage ../tools/security/gnupg-pkcs11-scd { }; 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; }; gnuplot_qt = gnuplot.override { withQt = true; };