diff options
| -rw-r--r-- | pkgs/development/libraries/pangolin/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix index f5b2f4c2b9973..09cbd86eb92b2 100644 --- a/pkgs/development/libraries/pangolin/default.nix +++ b/pkgs/development/libraries/pangolin/default.nix @@ -1,5 +1,7 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, doxygen, mesa_noglu, glew, xorg -, ffmpeg, python3 , libjpeg, libpng, libtiff, eigen }: +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, doxygen, mesa_noglu, glew +, xorg , ffmpeg, python3 , libjpeg, libpng, libtiff, eigen +, Carbon ? null, Cocoa ? null +}: stdenv.mkDerivation rec { name = "pangolin-${version}"; @@ -25,7 +27,8 @@ stdenv.mkDerivation rec { libpng libtiff eigen - ]; + ] + ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eb0ee3bc767a5..996691fa43517 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8180,7 +8180,9 @@ with pkgs; pango = callPackage ../development/libraries/pango { }; - pangolin = callPackage ../development/libraries/pangolin { }; + pangolin = callPackage ../development/libraries/pangolin { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + }; pangomm = callPackage ../development/libraries/pangomm { inherit (darwin.apple_sdk.frameworks) ApplicationServices; |