*: fix builds by disregarding warning from new glibc
Also, in case of collectd, the -lgcc_s shouldn't be needed anymore, as the library is in ${glibc}/lib/ now, which is practically always on RPATH. In case of seyren it was some stdenv change uncovering the mistake of putting src into buildInputs.
This commit is contained in:
parent
cacf3f6c1e
commit
06c6d4696d
@ -16,6 +16,9 @@ stdenv.mkDerivation {
|
|||||||
# these tests take a long time and don't
|
# these tests take a long time and don't
|
||||||
# always complete in the build environment
|
# always complete in the build environment
|
||||||
postPatch = "sed -i '/add_subdirectory(tests)/d' CMakeLists.txt";
|
postPatch = "sed -i '/add_subdirectory(tests)/d' CMakeLists.txt";
|
||||||
|
|
||||||
|
NIX_CFLAGS_COMPILE = "-Wno-error=cpp";
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
checkTarget = "test-release"; # this would be the target
|
checkTarget = "test-release"; # this would be the target
|
||||||
|
|
||||||
|
@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
|
|||||||
./ipc-lazytrace.patch
|
./ipc-lazytrace.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
|
postPatch = "substituteInPlace plugin/pluginutil.c --replace strndup strndup_";
|
||||||
|
|
||||||
passthru.mozillaPlugin = "/lib/mozilla/plugins";
|
passthru.mozillaPlugin = "/lib/mozilla/plugins";
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
@ -7,6 +7,8 @@ stdenv.mkDerivation {
|
|||||||
(fetchurl { url = "http://mawercer.de/~nix/repos/libsvgtiny-9721.tar.gz"; sha256 = "0c4c8e357c220218a32ef789eb2ba8226a403d4c2b550d7c65f351a0af5d1a71"; });
|
(fetchurl { url = "http://mawercer.de/~nix/repos/libsvgtiny-9721.tar.gz"; sha256 = "0c4c8e357c220218a32ef789eb2ba8226a403d4c2b550d7c65f351a0af5d1a71"; });
|
||||||
# END
|
# END
|
||||||
|
|
||||||
|
NIX_CFLAGS_COMPILE = "-Wno-error=cpp";
|
||||||
|
|
||||||
installPhase = "make PREFIX=$out install";
|
installPhase = "make PREFIX=$out install";
|
||||||
buildInputs = [pkgconfig gperf libxml2];
|
buildInputs = [pkgconfig gperf libxml2];
|
||||||
|
|
||||||
|
@ -18,6 +18,8 @@ stdenv.mkDerivation {
|
|||||||
|
|
||||||
buildPhase = "make -f makefile";
|
buildPhase = "make -f makefile";
|
||||||
|
|
||||||
|
NIX_CFLAGS_COMPILE = "-Wno-error=cpp";
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
mkdir -p "$out/bin"
|
mkdir -p "$out/bin"
|
||||||
cp ./disk_indicator "$out/bin/"
|
cp ./disk_indicator "$out/bin/"
|
||||||
|
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
phases = ["installPhase"];
|
phases = ["installPhase"];
|
||||||
|
|
||||||
buildInputs = [ makeWrapper jre src ];
|
buildInputs = [ makeWrapper jre ];
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
mkdir -p "$out"/bin
|
mkdir -p "$out"/bin
|
||||||
|
@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
|
|||||||
buildInputs = [ ncurses curl pkgconfig gnutls readline openssl perl libjpeg
|
buildInputs = [ ncurses curl pkgconfig gnutls readline openssl perl libjpeg
|
||||||
libzrtpcpp ];
|
libzrtpcpp ];
|
||||||
|
|
||||||
|
NIX_CFLAGS_COMPILE = "-Wno-error=cpp";
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Cross-Platform Scalable FREE Multi-Protocol Soft Switch";
|
description = "Cross-Platform Scalable FREE Multi-Protocol Soft Switch";
|
||||||
homepage = http://freeswitch.org/;
|
homepage = http://freeswitch.org/;
|
||||||
|
@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
cmakeFlags = [ "-DWITH_READLINE=yes" "-DWITH_EMBEDDED_SERVER=yes" "-DINSTALL_SCRIPTDIR=bin" ];
|
cmakeFlags = [ "-DWITH_READLINE=yes" "-DWITH_EMBEDDED_SERVER=yes" "-DINSTALL_SCRIPTDIR=bin" ];
|
||||||
|
|
||||||
|
NIX_CFLAGS_COMPILE = "-Wno-error=cpp";
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
prePatch = ''
|
prePatch = ''
|
||||||
|
@ -33,8 +33,6 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "1q365zx6d1wyhv7n97bagfxqnqbhj2j14zz552nhmjviy8lj2ibm";
|
sha256 = "1q365zx6d1wyhv7n97bagfxqnqbhj2j14zz552nhmjviy8lj2ibm";
|
||||||
};
|
};
|
||||||
|
|
||||||
NIX_LDFLAGS = "-lgcc_s"; # for pthread_cancel
|
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
pkgconfig curl iptables libcredis libdbi libgcrypt libmemcached cyrus_sasl
|
pkgconfig curl iptables libcredis libdbi libgcrypt libmemcached cyrus_sasl
|
||||||
libmodbus libnotify gdk_pixbuf liboping libpcap libsigrok libvirt
|
libmodbus libnotify gdk_pixbuf liboping libpcap libsigrok libvirt
|
||||||
@ -45,6 +43,8 @@ stdenv.mkDerivation rec {
|
|||||||
# for some reason libsigrok isn't auto-detected
|
# for some reason libsigrok isn't auto-detected
|
||||||
configureFlags = stdenv.lib.optional (libsigrok != null) "--with-libsigrok";
|
configureFlags = stdenv.lib.optional (libsigrok != null) "--with-libsigrok";
|
||||||
|
|
||||||
|
NIX_CFLAGS_COMPILE = "-Wno-error=cpp";
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
description = "Daemon which collects system performance statistics periodically";
|
description = "Daemon which collects system performance statistics periodically";
|
||||||
homepage = http://collectd.org;
|
homepage = http://collectd.org;
|
||||||
|
Loading…
Reference in New Issue
Block a user