diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2016-08-11 22:17:15 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2016-08-16 19:25:40 +0000 |
| commit | 410fa4b427635d0c1cc916c9cd40e1d8edea2368 (patch) | |
| tree | c9dbfbdbccbe8c35494502064ed255758fcf2ddf | |
| parent | 7afc589d7d4560180cbb8f9b037b452c4f84db8b (diff) | |
| download | nixlib-410fa4b427635d0c1cc916c9cd40e1d8edea2368.tar nixlib-410fa4b427635d0c1cc916c9cd40e1d8edea2368.tar.gz nixlib-410fa4b427635d0c1cc916c9cd40e1d8edea2368.tar.bz2 nixlib-410fa4b427635d0c1cc916c9cd40e1d8edea2368.tar.lz nixlib-410fa4b427635d0c1cc916c9cd40e1d8edea2368.tar.xz nixlib-410fa4b427635d0c1cc916c9cd40e1d8edea2368.tar.zst nixlib-410fa4b427635d0c1cc916c9cd40e1d8edea2368.zip | |
fox: fix darwin build
| -rw-r--r-- | pkgs/development/libraries/fox/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix index 2d44444ab40d..78c8b8645290 100644 --- a/pkgs/development/libraries/fox/default.nix +++ b/pkgs/development/libraries/fox/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor, libXrandr, libXft }: +{ stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor, libXrandr, libXft +, CoreServices ? null }: let version = "1.7.9"; @@ -12,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "1jb9368xsin3ppdf6979n5s7in3s9klbxqbwcp0z8misjixl7nzg"; }; - buildInputs = [ libpng xlibsWrapper libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ]; + buildInputs = [ libpng xlibsWrapper libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ] + ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; doCheck = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b273674794b2..b2e8a1c5ac5f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1615,6 +1615,7 @@ in fox = callPackage ../development/libraries/fox/default.nix { libpng = libpng12; + inherit (darwin.apple_sdk.frameworks) CoreServices; }; fox_1_6 = callPackage ../development/libraries/fox/fox-1.6.nix { }; |