Loading pkgs/development/libraries/plplot/default.nix +30 −17 Original line number Diff line number Diff line { lib , stdenv , fetchurl , cmake , enableWX ? false , wxGTK32 , Cocoa , enableXWin ? false , xorg { lib, stdenv, fetchurl, cmake, pkg-config, enableWX ? false, wxGTK32, Cocoa, enableXWin ? false, xorg, enablePNG ? false, cairo, pango, }: stdenv.mkDerivation rec { Loading @@ -18,11 +23,19 @@ stdenv.mkDerivation rec { sha256 = "0ywccb6bs1389zjfmc9zwdvdsvlpm7vg957whh6b5a96yvcf8bdr"; }; nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = lib.optional enableWX wxGTK32 buildInputs = lib.optional enableWX wxGTK32 ++ lib.optional (enableWX && stdenv.isDarwin) Cocoa ++ lib.optional enableXWin xorg.libX11; ++ lib.optional enableXWin xorg.libX11 ++ lib.optionals enablePNG [ cairo pango ]; passthru = { inherit (xorg) libX11; Loading Loading
pkgs/development/libraries/plplot/default.nix +30 −17 Original line number Diff line number Diff line { lib , stdenv , fetchurl , cmake , enableWX ? false , wxGTK32 , Cocoa , enableXWin ? false , xorg { lib, stdenv, fetchurl, cmake, pkg-config, enableWX ? false, wxGTK32, Cocoa, enableXWin ? false, xorg, enablePNG ? false, cairo, pango, }: stdenv.mkDerivation rec { Loading @@ -18,11 +23,19 @@ stdenv.mkDerivation rec { sha256 = "0ywccb6bs1389zjfmc9zwdvdsvlpm7vg957whh6b5a96yvcf8bdr"; }; nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = lib.optional enableWX wxGTK32 buildInputs = lib.optional enableWX wxGTK32 ++ lib.optional (enableWX && stdenv.isDarwin) Cocoa ++ lib.optional enableXWin xorg.libX11; ++ lib.optional enableXWin xorg.libX11 ++ lib.optionals enablePNG [ cairo pango ]; passthru = { inherit (xorg) libX11; Loading