lol

pangolin: fix OS X build

+9 -4
+6 -3
pkgs/development/libraries/pangolin/default.nix
··· 1 - { stdenv, fetchFromGitHub, cmake, pkgconfig, doxygen, mesa_noglu, glew, xorg 2 - , ffmpeg, python3 , libjpeg, libpng, libtiff, eigen }: 1 + { stdenv, lib, fetchFromGitHub, cmake, pkgconfig, doxygen, mesa_noglu, glew 2 + , xorg , ffmpeg, python3 , libjpeg, libpng, libtiff, eigen 3 + , Carbon ? null, Cocoa ? null 4 + }: 3 5 4 6 stdenv.mkDerivation rec { 5 7 name = "pangolin-${version}"; ··· 25 27 libpng 26 28 libtiff 27 29 eigen 28 - ]; 30 + ] 31 + ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ]; 29 32 30 33 enableParallelBuilding = true; 31 34
+3 -1
pkgs/top-level/all-packages.nix
··· 8180 8180 8181 8181 pango = callPackage ../development/libraries/pango { }; 8182 8182 8183 - pangolin = callPackage ../development/libraries/pangolin { }; 8183 + pangolin = callPackage ../development/libraries/pangolin { 8184 + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; 8185 + }; 8184 8186 8185 8187 pangomm = callPackage ../development/libraries/pangomm { 8186 8188 inherit (darwin.apple_sdk.frameworks) ApplicationServices;