diff options
| author | Moritz Ulrich <moritz@tarn-vedra.de> | 2016-09-18 14:26:40 +0200 |
|---|---|---|
| committer | Moritz Ulrich <moritz@tarn-vedra.de> | 2016-09-18 14:26:40 +0200 |
| commit | c8d4f40dc6411fe68c3f5108ccf351386db0e1f0 (patch) | |
| tree | 657d767fff1fe445bfd9c92565444356535113bc /pkgs | |
| parent | 6b8bd7c7d51d133ae5fca6aa7268a937e37de4c8 (diff) | |
| download | nixlib-c8d4f40dc6411fe68c3f5108ccf351386db0e1f0.tar nixlib-c8d4f40dc6411fe68c3f5108ccf351386db0e1f0.tar.gz nixlib-c8d4f40dc6411fe68c3f5108ccf351386db0e1f0.tar.bz2 nixlib-c8d4f40dc6411fe68c3f5108ccf351386db0e1f0.tar.lz nixlib-c8d4f40dc6411fe68c3f5108ccf351386db0e1f0.tar.xz nixlib-c8d4f40dc6411fe68c3f5108ccf351386db0e1f0.tar.zst nixlib-c8d4f40dc6411fe68c3f5108ccf351386db0e1f0.zip | |
Revert "libcaca: Enable support for png/jpeg/gif"
I didn't notice this was a mass-rebuild change. Pushing it to staging instead. This reverts commit 6b8bd7c7d51d133ae5fca6aa7268a937e37de4c8.
Diffstat (limited to 'pkgs')
| -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 5ff3157272ee..ee76b79ced8c 100644 --- a/pkgs/development/libraries/libcaca/default.nix +++ b/pkgs/development/libraries/libcaca/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, zlib, imlib2, pkgconfig, libX11 }: +{ stdenv, fetchurl, ncurses, zlib }: stdenv.mkDerivation rec { name = "libcaca-0.99.beta19"; @@ -13,7 +13,9 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" ]; - propagatedBuildInputs = [ ncurses zlib imlib2 pkgconfig libX11 ]; + configureFlags = "--disable-x11 --disable-imlib2 --disable-doc"; + + propagatedBuildInputs = [ ncurses zlib ]; postInstall = '' mkdir -p $dev/bin diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4023e16f64df..6f67c94d5bd4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7950,9 +7950,7 @@ in libburn = callPackage ../development/libraries/libburn { }; - libcaca = callPackage ../development/libraries/libcaca { - inherit (xlibs) libX11; - }; + libcaca = callPackage ../development/libraries/libcaca { }; libcanberra_gtk3 = callPackage ../development/libraries/libcanberra { gtk = pkgs.gtk3; |