colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glib: fix compilation on SmartOS/Illumos (close #12479)

Browse Source 
Recent illumos includes a linux-incompatible `inotify.h` header, which configure detects: compilation fails.
Also, a newer `dtrace` on SmartOS fails creating the probes ELF linkable object (with `dtrace -G`). Disable for now.

Remove old configure option `--disable-modular-tests`.
This commit is contained in:
Danny Wilson 2016-01-19 15:59:10 +01:00 committed by Vladimír Čunát
parent d51204e8de
commit e67717bc8d
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/glib/default.nix
View File

@ -68,12 +68,17 @@ stdenv.mkDerivation rec {
configureFlags =
optional stdenv.isDarwin "--disable-compile-warnings"
++ optional stdenv.isFreeBSD "--with-libiconv=gnu"
++ optional stdenv.isSunOS ["--disable-modular-tests" "--with-libiconv"];
++ optional (stdenv.isFreeBSD || stdenv.isSunOS) "--with-libiconv=gnu"
++ optional stdenv.isSunOS "--disable-dtrace";
NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl"
+ optionalString stdenv.isSunOS " -DBSD_COMP";
preConfigure = if !stdenv.isSunOS then null else
''
sed -i -e 's|inotify.h|foobar-inotify.h|g' configure
'';
preBuild = optionalString stdenv.isDarwin
''
export MACOSX_DEPLOYMENT_TARGET=