BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge #92128: wayland: documentation outputs (in staging)

Browse source
This commit is contained in:
Vladimír Čunát 2020-07-19 10:03:34 +02:00
commit 956f3224fe
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
4 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
pkgs/development/libraries/gd/default.nix
View file

@ -1,5 +1,7 @@
{ stdenv, fetchurl { stdenv, fetchurl, fetchpatch
, pkgconfig , autoconf
, automake
, pkg-config
, zlib , zlib
, libpng , libpng
, libjpeg ? null , libjpeg ? null
@ -20,11 +22,24 @@ stdenv.mkDerivation rec {
}; };
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
patches = [
# Fixes an issue where some other packages would fail to build
# their documentation with an error like:
# "Error: Problem doing text layout"
#
# Can be removed if Wayland can still be built successfully with
# documentation.
(fetchpatch {
url = "https://github.com/libgd/libgd/commit/3dd0e308cbd2c24fde2fc9e9b707181252a2de95.patch";
excludes = [ "tests/gdimagestringft/.gitignore" ];
sha256 = "12iqlanl9czig9d7c3rvizrigw2iacimnmimfcny392dv9iazhl1";
})
];
# -pthread gets passed to clang, causing warnings # -pthread gets passed to clang, causing warnings
configureFlags = stdenv.lib.optional stdenv.isDarwin "--enable-werror=no"; configureFlags = stdenv.lib.optional stdenv.isDarwin "--enable-werror=no";
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ autoconf automake pkg-config ];
buildInputs = [ zlib fontconfig freetype ]; buildInputs = [ zlib fontconfig freetype ];
propagatedBuildInputs = [ libpng libjpeg libwebp libtiff libXpm ]; propagatedBuildInputs = [ libpng libjpeg libwebp libtiff libXpm ];

4
pkgs/development/libraries/wayland/default.nix
View file

@ -1,7 +1,8 @@
{ lib, stdenv, fetchurl, meson, pkgconfig, ninja { lib, stdenv, fetchurl, meson, pkgconfig, ninja
, libffi, libxml2, wayland , libffi, libxml2, wayland
, expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0) , expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0)
, withDocumentation ? false, graphviz-nox, doxygen, libxslt, xmlto, python3 , withDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform
, graphviz-nox, doxygen, libxslt, xmlto, python3
, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42 , docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42
}: }:
@ -19,6 +20,7 @@ in stdenv.mkDerivation rec {
sha256 = "0k995rn96xkplrapz5k648j651wc43kq817xk1x8280h16gsfxa6"; sha256 = "0k995rn96xkplrapz5k648j651wc43kq817xk1x8280h16gsfxa6";
}; };
outputs = [ "out" ] ++ lib.optionals withDocumentation [ "doc" "man" ];
separateDebugInfo = true; separateDebugInfo = true;
mesonFlags = [ "-Ddocumentation=${lib.boolToString withDocumentation}" ]; mesonFlags = [ "-Ddocumentation=${lib.boolToString withDocumentation}" ];

4
pkgs/development/tools/misc/automake/automake-1.15.x.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, perl, autoconf }: { stdenv, fetchurl, perl, autoconf }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "automake-1.15"; name = "automake-1.15.1";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/automake/${name}.tar.xz"; url = "mirror://gnu/automake/${name}.tar.xz";
sha256 = "0dl6vfi2lzz8alnklwxzfz624b95hb1ipjvd3mk177flmddcf24r"; sha256 = "1bzd9g32dfm4rsbw93ld9x7b5nc1y6i4m6zp032qf1i28a8s6sxg";
}; };
nativeBuildInputs = [ autoconf perl ]; nativeBuildInputs = [ autoconf perl ];

1
pkgs/top-level/all-packages.nix
View file

@ -12036,6 +12036,7 @@ in
gf2x = callPackage ../development/libraries/gf2x {}; gf2x = callPackage ../development/libraries/gf2x {};
gd = callPackage ../development/libraries/gd { gd = callPackage ../development/libraries/gd {
automake = automake115x;
libtiff = null; libtiff = null;
libXpm = null; libXpm = null;
}; };