about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/libraries/plplot
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/plplot')
-rw-r--r--nixpkgs/pkgs/development/libraries/plplot/default.nix17
1 files changed, 8 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/development/libraries/plplot/default.nix b/nixpkgs/pkgs/development/libraries/plplot/default.nix
index f3a703ce1878..66c498418d98 100644
--- a/nixpkgs/pkgs/development/libraries/plplot/default.nix
+++ b/nixpkgs/pkgs/development/libraries/plplot/default.nix
@@ -3,14 +3,13 @@
 , fetchurl
 , cmake
 , enableWX ? false
-, wxGTK31, wxmac
+, wxGTK32
+, Cocoa
 , enableXWin ? false
-, libX11
+, xorg
 }:
 
-let
-  wxWidgets = (if stdenv.isDarwin then wxmac else wxGTK31);
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   pname   = "plplot";
   version = "5.15.0";
 
@@ -21,15 +20,15 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  buildInputs = lib.optional enableWX wxWidgets
-    ++ lib.optional enableXWin libX11;
+  buildInputs = lib.optional enableWX wxGTK32
+    ++ lib.optional (enableWX && stdenv.isDarwin) Cocoa
+    ++ lib.optional enableXWin xorg.libX11;
 
   passthru = {
+    inherit (xorg) libX11;
     inherit
       enableWX
-      wxWidgets
       enableXWin
-      libX11
     ;
   };