Merge #53490: fix treewide linking errors after #51770

Issue #53001.  This might not be all of them, but let's not wait.
This commit is contained in:
Vladimír Čunát
2019-01-06 12:14:52 +01:00
56 changed files with 199 additions and 19 deletions

View File

@@ -8,6 +8,10 @@ stdenv.mkDerivation rec {
sha256 = "0czccp4fcpf2ykp16xcrzdfmnircz1ynhls334q374xknd5747d2";
};
configureFlags = [
"--enable-shared"
];
# fails 1 out of 1 tests with "BAD GLOBAL SYMBOLS" on i686
# which can also be fixed with
# hardeningDisable = stdenv.lib.optional stdenv.isi686 "pic";

View File

@@ -17,7 +17,11 @@ stdenv.mkDerivation rec {
unzip cmake libGLU_combined freeglut libX11 xproto inputproto libXi
];
cmakeFlags = [ "-DBOX2D_INSTALL=ON" "-DBOX2D_BUILD_SHARED=ON" ];
cmakeFlags = [
"-DBOX2D_INSTALL=ON"
"-DBOX2D_BUILD_SHARED=ON"
"-DBOX2D_BUILD_EXAMPLES=OFF"
];
prePatch = ''
substituteInPlace Box2D/Common/b2Settings.h \

View File

@@ -11,6 +11,9 @@ stdenv.mkDerivation rec {
buildInputs = [ bison ];
patches = [ ./gcc-4.3.3-fixes.patch ];
configureFlags = [ "CFLAGS=-O3" "CXXFLAGS=-O3" ];
NIX_LDFLAGS = [
"-lm"
];
doCheck = true;
meta = {

View File

@@ -23,6 +23,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkgconfig ];
NIX_LDFLAGS = [
"-lbluetooth"
];
postInstall = ''
# Some programs (for example, cabal-install) have problems with the double 0
sed -i -e "s/0.6.00/0.6.0/" $out/lib/pkgconfig/cwiid.pc

View File

@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ dbus glib expat ];
configureFlags = [ "--disable-ecore" ];
configureFlags = [ "--disable-ecore" "--disable-tests" ];
meta = with stdenv.lib; {
homepage = http://dbus-cplusplus.sourceforge.net;

View File

@@ -45,6 +45,10 @@ stdenv.mkDerivation rec {
doCheck = false; # TODO: some issues with temporary files
NIX_LDFLAGS = [
"-lpthread"
];
enableParallelBuilding = true;
configureFlags = [

View File

@@ -39,4 +39,6 @@ stdenv.mkDerivation rec {
libintl
] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks;
[ IOKit CoreFoundation DiskArbitration ]);
NIX_LDFLAGS = [ "-lm" ];
}

View File

@@ -11,6 +11,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libX11 libXi libXtst xextproto ];
NIX_LDFLAGS = [
"-lX11"
];
meta = with stdenv.lib; {
description = "X virtual keyboard library";

View File

@@ -6,6 +6,9 @@ stdenv.mkDerivation rec {
buildInputs = [ libXft libICE pango libjpeg ];
propagatedBuildInputs = [ libX11 libXext libpng ];
NIX_LDFLAGS = [
"-lX11"
];
src = fetchurl {
url = "https://downloads.yoctoproject.org/releases/matchbox/libmatchbox/${version}/libmatchbox-${version}.tar.bz2";