Merge pull request #57687 from jacereda/libcaca-nox

libcaca: make x11 optional, disabled on darwin
This commit is contained in:
Daiderd Jordan 2019-03-26 21:25:03 +01:00 committed by GitHub
commit b0f4ef9127
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,4 +1,6 @@
{ stdenv, fetchurl, ncurses, zlib, imlib2, pkgconfig, libX11, libXext }: { stdenv, fetchurl, ncurses, zlib, pkgconfig, imlib2
, x11Support ? !stdenv.isDarwin, libX11, libXext
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libcaca-0.99.beta19"; name = "libcaca-0.99.beta19";
@ -13,8 +15,16 @@ stdenv.mkDerivation rec {
outputs = [ "bin" "dev" "out" "man" ]; outputs = [ "bin" "dev" "out" "man" ];
propagatedBuildInputs = [ ncurses zlib imlib2 pkgconfig libX11 ] configureFlags = [
++ stdenv.lib.optional stdenv.isDarwin libXext; (if x11Support then "--enable-x11" else "--disable-x11")
];
NIX_CFLAGS_COMPILE = stdenv.lib.optional (!x11Support) "-DX_DISPLAY_MISSING";
enableParallelBuilding = true;
propagatedBuildInputs = [ ncurses zlib pkgconfig (imlib2.override { inherit x11Support; }) ]
++ stdenv.lib.optionals x11Support [ libX11 libXext];
postInstall = '' postInstall = ''
mkdir -p $dev/bin mkdir -p $dev/bin