From d9cdbcc34ef342c13170e8f53d4416ffdd6f057f Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Sun, 18 Sep 2016 14:08:59 +0200
Subject: [PATCH] libcaca: Enable support for png/jpeg/gif

Fixes #18683
---
 pkgs/development/libraries/libcaca/default.nix | 6 ++----
 pkgs/top-level/all-packages.nix                | 4 +++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libcaca/default.nix b/pkgs/development/libraries/libcaca/default.nix
index ee76b79ced8..5ff3157272e 100644
--- a/pkgs/development/libraries/libcaca/default.nix
+++ b/pkgs/development/libraries/libcaca/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses, zlib }:
+{ stdenv, fetchurl, ncurses, zlib, imlib2, pkgconfig, libX11 }:
 
 stdenv.mkDerivation rec {
   name = "libcaca-0.99.beta19";
@@ -13,9 +13,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "bin" "dev" "out" "man" ];
 
-  configureFlags = "--disable-x11 --disable-imlib2 --disable-doc";
-
-  propagatedBuildInputs = [ ncurses zlib ];
+  propagatedBuildInputs = [ ncurses zlib imlib2 pkgconfig libX11 ];
 
   postInstall = ''
     mkdir -p $dev/bin
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2832f964609..3984f2f0cd3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7943,7 +7943,9 @@ in
 
   libburn = callPackage ../development/libraries/libburn { };
 
-  libcaca = callPackage ../development/libraries/libcaca { };
+  libcaca = callPackage ../development/libraries/libcaca {
+    inherit (xlibs) libX11;
+  };
 
   libcanberra_gtk3 = callPackage ../development/libraries/libcanberra {
     gtk = pkgs.gtk3;