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

Merge branch 'master' into staging

Browse Source
This commit is contained in:
obadz
2016-08-24 11:57:44 +01:00
parent f3886a6fba 4d4980d9f8
commit 78b7529ee3
46 changed files with 363 additions and 50 deletions
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
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;