pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #195910 from wegank/gnuplot-wxgtk

authored by Sandro and committed by GitHub 136fc956 e9a81267

+6 -3
unified split
+3 -2
pkgs/tools/graphics/gnuplot/default.nix
··· 8 , libXpm ? null 9 , libXaw ? null 10 , aquaterm ? false 11 - , withWxGTK ? false, wxGTK ? null 12 , fontconfig ? null 13 , gnused ? null 14 , coreutils ? null ··· 37 ++ lib.optional withCaca libcaca 38 ++ lib.optionals withX [ libX11 libXpm libXt libXaw ] 39 ++ lib.optionals withQt [ qtbase qtsvg ] 40 - ++ lib.optional withWxGTK wxGTK; 41 42 postPatch = '' 43 # lrelease is in qttools, not in qtbase.
··· 8 , libXpm ? null 9 , libXaw ? null 10 , aquaterm ? false 11 + , withWxGTK ? false, wxGTK32, Cocoa 12 , fontconfig ? null 13 , gnused ? null 14 , coreutils ? null ··· 37 ++ lib.optional withCaca libcaca 38 ++ lib.optionals withX [ libX11 libXpm libXt libXaw ] 39 ++ lib.optionals withQt [ qtbase qtsvg ] 40 + ++ lib.optional withWxGTK wxGTK32 41 + ++ lib.optional (withWxGTK && stdenv.isDarwin) Cocoa; 42 43 postPatch = '' 44 # lrelease is in qttools, not in qtbase.
+3 -1
pkgs/top-level/all-packages.nix
··· 7319 7320 gnupg-pkcs11-scd = callPackage ../tools/security/gnupg-pkcs11-scd { }; 7321 7322 - gnuplot = libsForQt5.callPackage ../tools/graphics/gnuplot { }; 7323 7324 gnuplot_qt = gnuplot.override { withQt = true; }; 7325
··· 7319 7320 gnupg-pkcs11-scd = callPackage ../tools/security/gnupg-pkcs11-scd { }; 7321 7322 + gnuplot = libsForQt5.callPackage ../tools/graphics/gnuplot { 7323 + inherit (darwin.apple_sdk.frameworks) Cocoa; 7324 + }; 7325 7326 gnuplot_qt = gnuplot.override { withQt = true; }; 7327