pyrox.dev
glib: fix compilation on SmartOS/Illumos (close #12477)
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`.
authored by Danny Wilson and committed by Vladimír Čunát 3f9ff30f e775690e
+7
-2
pkgs/development/libraries/glib/default.nix
+7
-2
pkgs/development/libraries/glib/default.nix
···
68
68
69
69
configureFlags =
70
70
optional stdenv.isDarwin "--disable-compile-warnings"
71
-
++ optional stdenv.isFreeBSD "--with-libiconv=gnu"
72
-
++ optional stdenv.isSunOS ["--disable-modular-tests" "--with-libiconv"];
71
+
++ optional (stdenv.isFreeBSD || stdenv.isSunOS) "--with-libiconv=gnu"
72
+
++ optional stdenv.isSunOS "--disable-dtrace";
73
73
74
74
NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl"
75
75
+ optionalString stdenv.isSunOS " -DBSD_COMP";
76
+
77
+
preConfigure = optionalString stdenv.isSunOS
78
+
''
79
+
sed -i -e 's|inotify.h|foobar-inotify.h|g' configure
80
+
'';
76
81
77
82
preBuild = optionalString stdenv.isDarwin
78
83
''