nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 09:53:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fox: fix darwin build

Browse Source
This commit is contained in:
Matthew Bauer 2016-08-11 22:17:15 -05:00
parent 7afc589d7d
commit 410fa4b427
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/fox/default.nix
View File

@ -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 let
version = "1.7.9"; version = "1.7.9";
@ -12,7 +13,8 @@ stdenv.mkDerivation rec {
sha256 = "1jb9368xsin3ppdf6979n5s7in3s9klbxqbwcp0z8misjixl7nzg"; 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; doCheck = true;

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

@ -1615,6 +1615,7 @@ in
fox = callPackage ../development/libraries/fox/default.nix { fox = callPackage ../development/libraries/fox/default.nix {
libpng = libpng12; libpng = libpng12;
inherit (darwin.apple_sdk.frameworks) CoreServices;
}; };
fox_1_6 = callPackage ../development/libraries/fox/fox-1.6.nix { }; fox_1_6 = callPackage ../development/libraries/fox/fox-1.6.nix { };