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

libcaca: Enable support for png/jpeg/gif 

Fixes #18683
This commit is contained in:
Moritz Ulrich 2016-09-18 14:08:59 +02:00
parent bb27f062e6
commit 6b8bd7c7d5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ncurses, zlib }: { stdenv, fetchurl, ncurses, zlib, imlib2, pkgconfig, libX11 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libcaca-0.99.beta19"; name = "libcaca-0.99.beta19";
@ -13,9 +13,7 @@ stdenv.mkDerivation rec {
outputs = [ "bin" "dev" "out" "man" ]; outputs = [ "bin" "dev" "out" "man" ];
configureFlags = "--disable-x11 --disable-imlib2 --disable-doc"; propagatedBuildInputs = [ ncurses zlib imlib2 pkgconfig libX11 ];
propagatedBuildInputs = [ ncurses zlib ];
postInstall = '' postInstall = ''
mkdir -p $dev/bin mkdir -p $dev/bin

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

@ -7950,7 +7950,9 @@ in
libburn = callPackage ../development/libraries/libburn { }; libburn = callPackage ../development/libraries/libburn { };
libcaca = callPackage ../development/libraries/libcaca { }; libcaca = callPackage ../development/libraries/libcaca {
inherit (xlibs) libX11;
};
libcanberra_gtk3 = callPackage ../development/libraries/libcanberra { libcanberra_gtk3 = callPackage ../development/libraries/libcanberra {
gtk = pkgs.gtk3; gtk = pkgs.gtk3;