From 436bf848b9b71a07ea15dc0eebcb1a706c12a26a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 28 Oct 2015 19:38:17 +0100 Subject: [PATCH] cairo: reduce bin output, and fixup a reference --- pkgs/development/libraries/cairo/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 7dce7d49b96..5550708800e 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { sha1 = "c8da68aa66ca0855b5d0ff552766d3e8679e1d24"; }; - outputs = [ "dev" "out" "bin" "doc" ]; + outputs = [ "dev" "out" "docdev" ]; + outputBin = "dev"; # very small nativeBuildInputs = [ pkgconfig libiconv ] ++ libintlOrEmpty; @@ -50,7 +51,7 @@ stdenv.mkDerivation rec { # Work around broken `Requires.private' that prevents Freetype # `-I' flags to be propagated. sed -i "src/cairo.pc.in" \ - -es'|^Cflags:\(.*\)$|Cflags: \1 -I${freetype}/include/freetype2 -I${freetype}/include|g' + -es'|^Cflags:\(.*\)$|Cflags: \1 -I${freetype.dev}/include/freetype2 -I${freetype.dev}/include|g' ''; enableParallelBuilding = true;