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/servers | |
| 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/servers')
| -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 |
3 files changed, 5 insertions, 1 deletions
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 = '' |