Merge pull request #218503 from Artturin/strictdeps4

This commit is contained in:
Artturi 2023-03-02 18:45:34 +02:00 committed by GitHub
commit 44fd51cd47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 5 deletions

View File

@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-QSrCQhP3t+WPyBQPLJbZEaDCjXD8Lo6IAGKHsbL2S1o=";
};
strictDeps = true;
nativeBuildInputs = [
autoreconfHook
pkg-config
@ -39,7 +40,9 @@ stdenv.mkDerivation rec {
buildInputs = [
# lou_checkYaml
libyaml
# maketable.d
];
nativeCheckInputs = [
perl
];

View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, docbook_xsl, docbook_xsl_ns, gettext, libxslt, glibcLocales, docbook_xml_dtd_412, docbook_sgml_dtd_41, texlive, opensp
{ stdenv, lib, fetchurl, docbook_xsl, docbook_xsl_ns, gettext, libxslt, glibcLocales, docbook_xml_dtd_412, docbook_sgml_dtd_41, texlive, opensp, bash
, perl, buildPerlPackage, ModuleBuild, TextWrapI18N, LocaleGettext, TermReadKey, SGMLSpm, UnicodeLineBreak, PodParser, YAMLTiny
, fetchpatch
}:
@ -18,10 +18,12 @@ buildPerlPackage rec {
sha256 = "9MVkYiItR2P3PBCUc4OhEOUHQuLqTWUYtYlZ3L8miC8=";
})
];
nativeBuildInputs = [ docbook_xsl docbook_xsl_ns ModuleBuild ];
strictDeps = true;
nativeBuildInputs = [ gettext libxslt docbook_xsl docbook_xsl_ns ModuleBuild docbook_xml_dtd_412 docbook_sgml_dtd_41 opensp texlive.combined.scheme-basic glibcLocales ];
propagatedBuildInputs = lib.optional (!stdenv.hostPlatform.isMusl) TextWrapI18N ++ [ LocaleGettext SGMLSpm UnicodeLineBreak PodParser YAMLTiny ];
# TODO: TermReadKey was temporarily removed from propagatedBuildInputs to unfreeze the build
buildInputs = [ gettext libxslt glibcLocales docbook_xml_dtd_412 docbook_sgml_dtd_41 texlive.combined.scheme-basic opensp ];
buildInputs = [ bash ];
LC_ALL = "en_US.UTF-8";
SGML_CATALOG_FILES = "${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml";
preConfigure = ''

View File

@ -26,12 +26,15 @@ in stdenv.mkDerivation rec {
outputs = [ "out" "dev" "lib" ] ++ lib.optional withDevdoc "devdoc";
strictDeps = true;
nativeBuildInputs = [
autoconf automake docbook_xsl libtool libxslt pkg-config
docbook_xml_dtd_42 # for the man pages
] ++ lib.optionals withDevdoc [ docbook_xml_dtd_43 gtk-doc ];
buildInputs = [ xz zstd ];
buildInputs = [ xz zstd ]
# gtk-doc is looked for with pkg-config
++ lib.optionals withDevdoc [ gtk-doc ];
preConfigure = ''
./autogen.sh

View File

@ -303,6 +303,8 @@ let
url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Libxml2-0.17.tar.gz";
hash = "sha256-c7RSRPC1w25TMsM1abgqGrLDPiY/HQB4XSADvK7GjbM=";
};
strictDeps = true;
nativeBuildInputs = [ pkgs.pkg-config ];
propagatedBuildInputs = [ AlienBuild ];
buildInputs = [ pkgs.libxml2 MojoDOM58 SortVersions Test2Suite URI ];
meta = {