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

Merge pull request #34173 from dtzWill/fix/cross-misc-ben-1

Browse Source 
misc minor cross fixups from @bgamari
This commit is contained in:
John Ericson 2018-01-22 21:44:34 -05:00 committed by GitHub
commit f432c48298
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/libdaemon/default.nix
View File

@ -8,7 +8,11 @@ stdenv.mkDerivation rec {
sha256 = "0d5qlq5ab95wh1xc87rqrh1vx6i8lddka1w3f1zcqvcqdxgyn8zx";
};
configureFlags = [ "--disable-lynx" ];
configureFlags = [ "--disable-lynx" ]
++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
[ # Can't run this test while cross-compiling
"ac_cv_func_setpgrp_void=yes"
];
meta = {
description = "Lightweight C library that eases the writing of UNIX daemons";

7
pkgs/development/libraries/libxslt/default.nix
View File

@ -40,12 +40,13 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ findXMLCatalogs ];
# TODO move cryptoSupport as last flag, when upgrading libxslt
configureFlags = optional (!cryptoSupport) "--without-crypto" ++ [
configureFlags = [
"--with-libxml-prefix=${libxml2.dev}"
"--without-debug"
"--without-mem-debug"
"--without-debugger"
] ++ optional pythonSupport "--with-python=${python2}";
] ++ optional pythonSupport "--with-python=${python2}"
++ optional (!cryptoSupport) "--without-crypto";
postFixup = ''
moveToOutput bin/xslt-config "$dev"

3
pkgs/development/tools/misc/automake/automake-1.15.x.nix
View File

@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "1bzd9g32dfm4rsbw93ld9x7b5nc1y6i4m6zp032qf1i28a8s6sxg";
};
buildInputs = [ perl autoconf ];
nativeBuildInputs = [ autoconf perl ];
buildInputs = [ autoconf ];
setupHook = ./setup-hook.sh;

2
pkgs/development/tools/misc/libtool/libtool2.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "lib" ];
nativeBuildInputs = [ perl help2man ];
nativeBuildInputs = [ perl help2man m4 ];
propagatedBuildInputs = [ m4 ];
# Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the

3
pkgs/os-specific/linux/alsa-utils/default.nix
View File

@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
--replace "which" "type -p" \
--replace "lspci" "${pciutils}/bin/lspci"
'';
buildInputs = [ gettext alsaLib ncurses libsamplerate fftw ];
nativeBuildInputs = [ gettext ];
buildInputs = [ alsaLib ncurses libsamplerate fftw ];
configureFlags = "--disable-xmlto --with-udev-rules-dir=$(out)/lib/udev/rules.d";

5
pkgs/os-specific/linux/procps-ng/default.nix
View File

@ -16,7 +16,10 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
# Too red
configureFlags = [ "--disable-modern-top" ];
configureFlags = [ "--disable-modern-top" ]
++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform)
[ "ac_cv_func_malloc_0_nonnull=yes"
"ac_cv_func_realloc_0_nonnull=yes" ];
meta = {
homepage = https://sourceforge.net/projects/procps-ng/;

3
pkgs/tools/archivers/zip/default.nix
View File

@ -12,6 +12,9 @@ stdenv.mkDerivation {
];
sha256 = "0sb3h3067pzf3a7mlxn1hikpcjrsvycjcnj9hl9b1c3ykcgvps7h";
};
patchPhase = ''
substituteInPlace unix/Makefile --replace 'CC = cc' ""
'';
hardeningDisable = [ "format" ];

2
pkgs/tools/package-management/nix-prefetch-scripts/default.nix
View File

@ -6,7 +6,7 @@ let mkPrefetchScript = tool: src: deps:
stdenv.mkDerivation {
name = "nix-prefetch-${tool}";
buildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ];
unpackPhase = ":";

3
pkgs/top-level/perl-packages.nix
View File

@ -11263,7 +11263,8 @@ let self = _self // overrides; _self = with self; {
url = "https://alioth.debian.org/frs/download.php/file/4142/po4a-0.47.tar.gz";
sha256 = "5010e1b7df1115cbd475f46587fc05fefc97301f9bba0c2f15106005ca017507";
};
propagatedBuildInputs = [ pkgs.docbook_xml_xslt TextWrapI18N LocaleGettext TermReadKey SGMLSpm ModuleBuild UnicodeLineBreak ModuleBuild ];
nativeBuildInputs = [ pkgs.docbook_xml_xslt pkgs.docbook_xsl pkgs.docbook_xsl_ns ];
propagatedBuildInputs = [ TextWrapI18N LocaleGettext TermReadKey SGMLSpm ModuleBuild UnicodeLineBreak ModuleBuild ];
buildInputs = [ pkgs.gettext pkgs.libxslt pkgs.glibcLocales pkgs.docbook_xml_dtd_412 pkgs.docbook_sgml_dtd_41 pkgs.texlive.combined.scheme-basic pkgs.jade ];
LC_ALL="en_US.UTF-8";
SGML_CATALOG_FILES = "${pkgs.docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml";