Merge pull request #51893 from Mic92/cross-fixes-2

treewide: cross-fixes (memcached, opendkim, gdb, tcl, xorg*)
This commit is contained in:
Jörg Thalheim 2018-12-16 01:28:16 +00:00 committed by GitHub
commit ba5cba0b0d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 60 additions and 35 deletions

View file

@ -98,7 +98,7 @@ rec {
in
if final.parsed.kernel.name == pkgs.stdenv.hostPlatform.parsed.kernel.name &&
(final.parsed.cpu.name == pkgs.stdenv.hostPlatform.parsed.cpu.name ||
(final.platform.isi686 && pkgs.stdenv.hostPlatform.isx86_64))
(final.isi686 && pkgs.stdenv.hostPlatform.isx86_64))
then pkgs.runtimeShell
else if final.isWindows
then "${wine}/bin/${wine-name}"

View file

@ -15,15 +15,19 @@ stdenv.mkDerivation rec {
setOutputFlags = false;
preConfigure = ''
# Note: using $out instead of $man to prevent a runtime dependency on $man.
configureFlagsArray+=(--mandir=$out/share/man --enable-man-symlinks)
# Don't install tzdata because NixOS already has a more up-to-date copy.
configureFlagsArray+=(--with-tzdata=no)
cd unix
'';
configureFlags = [
"--enable-threads"
# Note: using $out instead of $man to prevent a runtime dependency on $man.
"--mandir=${placeholder "out"}/share/man"
"--enable-man-symlinks"
# Don't install tzdata because NixOS already has a more up-to-date copy.
"--with-tzdata=no"
"tcl_cv_strtod_unbroken=ok"
] ++ stdenv.lib.optional stdenv.is64bit "--enable-64bit";
enableParallelBuilding = true;
postInstall = ''

View file

@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
mkdir -p $out/lib
cd libmilter
cat > a.m4 <<EOF
define(\`confCC', \`$CC')
define(\`confAR', \`$AR')
define(\`confEBINDIR', \`$out/libexec')
define(\`confINCLUDEDIR', \`$out/include')
define(\`confLIBDIR', \`$out/lib')
@ -29,9 +31,9 @@ stdenv.mkDerivation rec {
sh Build -f ./a.m4
'';
patches = [ ./install.patch ./sharedlib.patch];
patches = [ ./install.patch ./sharedlib.patch ];
buildInputs = [ m4 ];
nativeBuildInputs = [ m4 ];
meta = with stdenv.lib; {
description = "Sendmail Milter mail filtering API library";

View file

@ -2,7 +2,7 @@
, pkgconfig, intltool, autoreconfHook
, file, expat, libdrm, xorg, wayland, wayland-protocols, openssl
, llvmPackages, libffi, libomxil-bellagio, libva-minimal
, libelf, libvdpau, valgrind-light, python2
, libelf, libvdpau, valgrind-light, python2, python2Packages
, libglvnd
, enableRadv ? true
, galliumDrivers ? null
@ -134,11 +134,14 @@ let self = stdenv.mkDerivation {
"--disable-opencl"
];
nativeBuildInputs = [ autoreconfHook intltool pkgconfig file ];
nativeBuildInputs = [
autoreconfHook intltool pkgconfig file
python2 python2Packages.Mako
];
propagatedBuildInputs = with xorg;
[ libXdamage libXxf86vm ]
++ optional stdenv.isLinux libdrm
propagatedBuildInputs = with xorg; [
libXdamage libXxf86vm
] ++ optional stdenv.isLinux libdrm
++ optionals stdenv.isDarwin [ OpenGL Xplugin ];
buildInputs = with xorg; [
@ -147,7 +150,6 @@ let self = stdenv.mkDerivation {
libX11 libXext libxcb libXt libXfixes libxshmfence libXrandr
libffi libvdpau libelf libXvMC
libpthreadstubs openssl /*or another sha1 provider*/
python2 python2.pkgs.Mako
] ++ lib.optionals (elem "wayland" eglPlatforms) [ wayland wayland-protocols ]
++ lib.optionals stdenv.isLinux [ valgrind-light libomxil-bellagio libva-minimal ];

View file

@ -10,7 +10,11 @@ stdenv.mkDerivation rec {
sha256 = "06v8bqhh604sz9rh5bvw278issrwjgc4h1wx2pz9a84lpxbvm823";
};
configureFlags= [ "--with-milter=${libmilter}" ];
configureFlags= [
"--with-milter=${libmilter}"
"ac_cv_func_malloc_0_nonnull=yes"
"ac_cv_func_realloc_0_nonnull=yes"
];
nativeBuildInputs = [ pkgconfig makeWrapper ];

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, python, pkgconfig, readline, libxslt
, docbook_xsl, docbook_xml_dtd_42
{ stdenv, fetchurl, python2, pkgconfig, readline, libxslt
, docbook_xsl, docbook_xml_dtd_42, buildPackages
}:
stdenv.mkDerivation rec {
@ -10,28 +10,32 @@ stdenv.mkDerivation rec {
sha256 = "1ibcz466xwk1x6xvzlgzd5va4lyrjzm3rnjak29kkwk7cmhw4gva";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig python2 ];
buildInputs = [
python readline libxslt docbook_xsl docbook_xml_dtd_42
readline libxslt docbook_xsl docbook_xml_dtd_42
];
preConfigure = ''
sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,g' buildtools/bin/waf
patchShebangs buildtools/bin/waf
'';
configureFlags = [
"--bundled-libraries=NONE"
"--builtin-libraries=replace"
] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
"--cross-compile"
"--cross-execute=${stdenv.hostPlatform.emulator buildPackages}"
];
configurePlatforms = [ ];
meta = with stdenv.lib; {
description = "The trivial database";
longDescription =
'' TDB is a Trivial Database. In concept, it is very much like GDBM,
and BSD's DB except that it allows multiple simultaneous writers and
uses locking internally to keep writers from trampling on each
other. TDB is also extremely small.
'';
longDescription = ''
TDB is a Trivial Database. In concept, it is very much like GDBM,
and BSD's DB except that it allows multiple simultaneous writers
and uses locking internally to keep writers from trampling on each
other. TDB is also extremely small.
'';
homepage = https://tdb.samba.org/;
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ wkennington ];

View file

@ -11,15 +11,15 @@ stdenv.mkDerivation rec {
# autoreconfHook is needed to pick up patching of Makefile.am
# Remove when the patch no longer applies.
patches = [ ./coregrind-makefile-race.patch ];
nativeBuildInputs = [ autoreconfHook ];
# Perl is needed for `cg_annotate'.
nativeBuildInputs = [ autoreconfHook perl ];
outputs = [ "out" "dev" "man" "doc" ];
hardeningDisable = [ "stackprotector" ];
# Perl is needed for `cg_annotate'.
# GDB is needed to provide a sane default for `--db-command'.
buildInputs = [ perl gdb ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ bootstrap_cmds xnu ];
buildInputs = [ gdb ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ bootstrap_cmds xnu ];
enableParallelBuilding = true;
separateDebugInfo = stdenv.isLinux;

View file

@ -1,7 +1,7 @@
{ stdenv
# Build time
, fetchurl, fetchpatch, pkgconfig, perl, texinfo, setupDebugInfoDirs
, fetchurl, fetchpatch, pkgconfig, perl, texinfo, setupDebugInfoDirs, buildPackages
# Run time
, ncurses, readline, gmp, mpfr, expat, zlib, dejagnu
@ -49,6 +49,8 @@ stdenv.mkDerivation rec {
propagatedNativeBuildInputs = [ setupDebugInfoDirs ];
depsBuildBuild = [ buildPackages.stdenv.cc ];
enableParallelBuilding = true;
# darwin build fails with format hardening since v7.12

View file

@ -9,6 +9,10 @@ stdenv.mkDerivation rec {
sha256 = "0aav15f0lh8k4i62aza2bdv4s8vv65j38pz2zc4v45snd3arfby0";
};
configureFlags = [
"ac_cv_c_endian=${if stdenv.hostPlatform.isBigEndian then "big" else "little"}"
];
buildInputs = [cyrus_sasl libevent];
hardeningEnable = [ "pie" ];

View file

@ -145,7 +145,8 @@ self: super:
configureFlags = attrs.configureFlags or []
++ malloc0ReturnsNullCrossFlag;
propagatedBuildInputs = [ self.libSM ];
CPP = stdenv.lib.optionalString stdenv.isDarwin "clang -E -";
depsBuildBuild = [ buildPackages.stdenv.cc ];
CPP = if stdenv.isDarwin then "clang -E -" else "${stdenv.cc.targetPrefix}cc -E -";
outputs = [ "out" "dev" "devdoc" ];
});
@ -213,6 +214,8 @@ self: super:
libXinerama = super.libXinerama.overrideAttrs (attrs: {
outputs = [ "out" "dev" ];
configureFlags = attrs.configureFlags or []
++ malloc0ReturnsNullCrossFlag;
});
libXmu = super.libXmu.overrideAttrs (attrs: {
@ -251,6 +254,8 @@ self: super:
libXvMC = super.libXvMC.overrideAttrs (attrs: {
outputs = [ "out" "dev" "doc" ];
configureFlags = attrs.configureFlags or []
++ malloc0ReturnsNullCrossFlag;
buildInputs = attrs.buildInputs ++ [self.renderproto];
});

View file

@ -12588,9 +12588,7 @@ in
python = python2;
};
tdb = callPackage ../development/libraries/tdb {
python = python2;
};
tdb = callPackage ../development/libraries/tdb {};
tecla = callPackage ../development/libraries/tecla { };