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

Merge pull request #19429 from LnL7/darwin-libcaca

Browse Source 
libcaca: fix missing darwin inputs
This commit is contained in:
Jörg Thalheim 2016-10-10 21:10:24 +02:00 committed by GitHub
commit 807dddca56
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -7477,7 +7477,7 @@ in
libburn = callPackage ../development/libraries/libburn { };
libcaca = callPackage ../development/libraries/libcaca {
inherit (xlibs) libX11;
inherit (xlibs) libX11 libXext;
};
libcanberra_gtk3 = callPackage ../development/libraries/libcanberra {