public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pangolin: fix OS X build

Browse Source
This commit is contained in:
Joe Hermaszewski 2017-08-09 22:14:23 +01:00
parent 4b1bcf8724
commit 7cd44aeeef
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/pangolin/default.nix
View File

@ -1,5 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, doxygen, mesa_noglu, glew, xorg { stdenv, lib, fetchFromGitHub, cmake, pkgconfig, doxygen, mesa_noglu, glew
, ffmpeg, python3 , libjpeg, libpng, libtiff, eigen }: , xorg , ffmpeg, python3 , libjpeg, libpng, libtiff, eigen
, Carbon ? null, Cocoa ? null
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pangolin-${version}"; name = "pangolin-${version}";
@ -25,7 +27,8 @@ stdenv.mkDerivation rec {
libpng libpng
libtiff libtiff
eigen eigen
]; ]
++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ];
enableParallelBuilding = true; enableParallelBuilding = true;

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

@ -8180,7 +8180,9 @@ with pkgs;
pango = callPackage ../development/libraries/pango { }; 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 { pangomm = callPackage ../development/libraries/pangomm {
inherit (darwin.apple_sdk.frameworks) ApplicationServices; inherit (darwin.apple_sdk.frameworks) ApplicationServices;