diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2020-04-14 09:13:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-14 09:13:36 -0400 |
| commit | 46bf4cb28365daa2ddbf87ff1e141b9105386c11 (patch) | |
| tree | 54928055a51220ffdf27742e7d7e39df2a6f20fb /pkgs/development/libraries/cairo | |
| parent | c8a6ea5161404792e25e6c4c274ef2cfaadbcb91 (diff) | |
| parent | 84f720d9a40aae4307ab40c877864f975012b2f9 (diff) | |
Merge pull request #83808 from glittershark/fix-cairo-no-xlib
cairo: pass --disable-xlib to config if no x11
Diffstat (limited to 'pkgs/development/libraries/cairo')
| -rw-r--r-- | pkgs/development/libraries/cairo/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index e5e2eba1118a..628046a57411 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { ++ optional glSupport libGL ; # TODO: maybe liblzo but what would it be for here? - configureFlags = if stdenv.isDarwin then [ + configureFlags = (if stdenv.isDarwin then [ "--disable-dependency-tracking" "--enable-quartz" "--enable-quartz-font" @@ -71,7 +71,7 @@ in stdenv.mkDerivation rec { ++ optional xcbSupport "--enable-xcb" ++ optional glSupport "--enable-gl" ++ optional pdfSupport "--enable-pdf" - ); + )) ++ optional (!x11Support) "--disable-xlib"; preConfigure = # On FreeBSD, `-ldl' doesn't exist. |