diff options
author | Moritz Ulrich <moritz@tarn-vedra.de> | 2016-09-18 14:08:59 +0200 |
---|---|---|
committer | Moritz Ulrich <moritz@tarn-vedra.de> | 2016-09-18 14:23:09 +0200 |
commit | 6b8bd7c7d51d133ae5fca6aa7268a937e37de4c8 (patch) | |
tree | fe781628ebb82291f2b63949d577525b9ad08338 | |
parent | bb27f062e6575d8f075d24181b977596f6888279 (diff) | |
download | nixpkgs-6b8bd7c7d51d133ae5fca6aa7268a937e37de4c8.tar nixpkgs-6b8bd7c7d51d133ae5fca6aa7268a937e37de4c8.tar.gz nixpkgs-6b8bd7c7d51d133ae5fca6aa7268a937e37de4c8.tar.bz2 nixpkgs-6b8bd7c7d51d133ae5fca6aa7268a937e37de4c8.tar.lz nixpkgs-6b8bd7c7d51d133ae5fca6aa7268a937e37de4c8.tar.xz nixpkgs-6b8bd7c7d51d133ae5fca6aa7268a937e37de4c8.tar.zst nixpkgs-6b8bd7c7d51d133ae5fca6aa7268a937e37de4c8.zip |
libcaca: Enable support for png/jpeg/gif
Fixes #18683
-rw-r--r-- | pkgs/development/libraries/libcaca/default.nix | 6 | ||||
-rw-r--r-- | 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 6f67c94d5bd..4023e16f64d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7950,7 +7950,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; |