diff options
| author | aszlig <aszlig@nix.build> | 2017-11-13 09:44:04 +0100 |
|---|---|---|
| committer | aszlig <aszlig@nix.build> | 2017-11-13 10:14:05 +0100 |
| commit | 4cf16937ce0757fb0ca35e1e81223e020f0750f5 (patch) | |
| tree | bffe01410fe27142d4af69af8404385e5da3382f | |
| parent | 8b0f2b22a52ec704def97a894c6b2c408d763be5 (diff) | |
| download | nixlib-4cf16937ce0757fb0ca35e1e81223e020f0750f5.tar nixlib-4cf16937ce0757fb0ca35e1e81223e020f0750f5.tar.gz nixlib-4cf16937ce0757fb0ca35e1e81223e020f0750f5.tar.bz2 nixlib-4cf16937ce0757fb0ca35e1e81223e020f0750f5.tar.lz nixlib-4cf16937ce0757fb0ca35e1e81223e020f0750f5.tar.xz nixlib-4cf16937ce0757fb0ca35e1e81223e020f0750f5.tar.zst nixlib-4cf16937ce0757fb0ca35e1e81223e020f0750f5.zip | |
opencascade: Fix build against glibc 2.26
The header file xlocale.h has been removed in glibc 2.26.
Quoting the release notes[1]:
* The nonstandard header <xlocale.h> has been removed. Most programs
should use <locale.h> instead. If you have a specific need for the
definition of locale_t with no other declarations, please contact
libc-alpha@sourceware.org and explain.
Tested by building on x86_64-linux and it now succeeds.
[1]: https://sourceware.org/ml/libc-alpha/2017-08/msg00010.html
Signed-off-by: aszlig <aszlig@nix.build>
Cc: @viric
| -rw-r--r-- | pkgs/development/libraries/opencascade/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix index 58f9019d6e03..c2fba26ba686 100644 --- a/pkgs/development/libraries/opencascade/default.nix +++ b/pkgs/development/libraries/opencascade/default.nix @@ -10,6 +10,12 @@ stdenv.mkDerivation rec { buildInputs = [ mesa tcl tk file libXmu libtool qt4 ftgl freetype cmake ]; + # Fix for glibc 2.26 + postPatch = '' + sed -i -e 's/^\( *#include <\)x\(locale.h>\)//' \ + src/Standard/Standard_CLocaleSentry.hxx + ''; + preConfigure = '' cmakeFlags="$cmakeFlags -DOCE_INSTALL_PREFIX=$out" ''; |