diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-11-28 18:40:19 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-11-28 18:42:03 +0100 |
commit | 06c6d4696d47e79b30a8d4ec4cd2dc7f4e135732 (patch) | |
tree | 01b8b4e11f3cf57bdaa9d3130beb1b5f05ff6fd1 /pkgs | |
parent | cacf3f6c1e4dddc3d44b442fbc2cec4d7b935dcb (diff) | |
download | nixpkgs-06c6d4696d47e79b30a8d4ec4cd2dc7f4e135732.tar nixpkgs-06c6d4696d47e79b30a8d4ec4cd2dc7f4e135732.tar.gz nixpkgs-06c6d4696d47e79b30a8d4ec4cd2dc7f4e135732.tar.bz2 nixpkgs-06c6d4696d47e79b30a8d4ec4cd2dc7f4e135732.tar.lz nixpkgs-06c6d4696d47e79b30a8d4ec4cd2dc7f4e135732.tar.xz nixpkgs-06c6d4696d47e79b30a8d4ec4cd2dc7f4e135732.tar.zst nixpkgs-06c6d4696d47e79b30a8d4ec4cd2dc7f4e135732.zip |
*: 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.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/misc/monero/default.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix | 2 | ||||
-rw-r--r-- | pkgs/os-specific/linux/disk-indicator/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/monitoring/seyren/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/sip/freeswitch/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/system/collectd/default.nix | 4 |
8 files changed, 16 insertions, 3 deletions
diff --git a/pkgs/applications/misc/monero/default.nix b/pkgs/applications/misc/monero/default.nix index 1fe5406384f..6af9b7dc267 100644 --- a/pkgs/applications/misc/monero/default.nix +++ b/pkgs/applications/misc/monero/default.nix @@ -16,6 +16,9 @@ stdenv.mkDerivation { # these tests take a long time and don't # always complete in the build environment postPatch = "sed -i '/add_subdirectory(tests)/d' CMakeLists.txt"; + + NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; + doCheck = false; checkTarget = "test-release"; # this would be the target diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix index 229aa4f23ba..3b473019600 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { ./ipc-lazytrace.patch ]; + postPatch = "substituteInPlace plugin/pluginutil.c --replace strndup strndup_"; + passthru.mozillaPlugin = "/lib/mozilla/plugins"; meta = { diff --git a/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix b/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix index 300e9965092..1e9f74a1ffd 100644 --- a/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix +++ b/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix @@ -7,6 +7,8 @@ stdenv.mkDerivation { (fetchurl { url = "http://mawercer.de/~nix/repos/libsvgtiny-9721.tar.gz"; sha256 = "0c4c8e357c220218a32ef789eb2ba8226a403d4c2b550d7c65f351a0af5d1a71"; }); # END + NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; + installPhase = "make PREFIX=$out install"; buildInputs = [pkgconfig gperf libxml2]; diff --git a/pkgs/os-specific/linux/disk-indicator/default.nix b/pkgs/os-specific/linux/disk-indicator/default.nix index b60232a9b75..11c1e7ee8a2 100644 --- a/pkgs/os-specific/linux/disk-indicator/default.nix +++ b/pkgs/os-specific/linux/disk-indicator/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation { buildPhase = "make -f makefile"; + NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; + installPhase = '' mkdir -p "$out/bin" cp ./disk_indicator "$out/bin/" diff --git a/pkgs/servers/monitoring/seyren/default.nix b/pkgs/servers/monitoring/seyren/default.nix index e428067ab62..ab8365c23f8 100644 --- a/pkgs/servers/monitoring/seyren/default.nix +++ b/pkgs/servers/monitoring/seyren/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { phases = ["installPhase"]; - buildInputs = [ makeWrapper jre src ]; + buildInputs = [ makeWrapper jre ]; installPhase = '' mkdir -p "$out"/bin diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index c4a5fcc4284..5b6ff15cb10 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses curl pkgconfig gnutls readline openssl perl libjpeg libzrtpcpp ]; + NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; + meta = { description = "Cross-Platform Scalable FREE Multi-Protocol Soft Switch"; homepage = http://freeswitch.org/; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 04f82022373..c0548f07dd3 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DWITH_READLINE=yes" "-DWITH_EMBEDDED_SERVER=yes" "-DINSTALL_SCRIPTDIR=bin" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; + enableParallelBuilding = true; prePatch = '' diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index 4210a0a04a5..692016153a6 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -33,8 +33,6 @@ stdenv.mkDerivation rec { sha256 = "1q365zx6d1wyhv7n97bagfxqnqbhj2j14zz552nhmjviy8lj2ibm"; }; - NIX_LDFLAGS = "-lgcc_s"; # for pthread_cancel - buildInputs = [ pkgconfig curl iptables libcredis libdbi libgcrypt libmemcached cyrus_sasl libmodbus libnotify gdk_pixbuf liboping libpcap libsigrok libvirt @@ -45,6 +43,8 @@ stdenv.mkDerivation rec { # for some reason libsigrok isn't auto-detected configureFlags = stdenv.lib.optional (libsigrok != null) "--with-libsigrok"; + NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; + meta = with stdenv.lib; { description = "Daemon which collects system performance statistics periodically"; homepage = http://collectd.org; |