pyrox.dev
Revert "glib: fix compilation on SmartOS/Illumos (close #12477)"
This reverts commit 3f9ff30f6d3972b2dada00b022b1bced8f83cd42.
Let's go without changing hash instead: e67717bc8d545c
+2
-7
pkgs/development/libraries/glib/default.nix
+2
-7
pkgs/development/libraries/glib/default.nix
···
68
68
69
69
configureFlags =
70
70
optional stdenv.isDarwin "--disable-compile-warnings"
71
-
++ optional (stdenv.isFreeBSD || stdenv.isSunOS) "--with-libiconv=gnu"
72
-
++ optional stdenv.isSunOS "--disable-dtrace";
71
+
++ optional stdenv.isFreeBSD "--with-libiconv=gnu"
72
+
++ optional stdenv.isSunOS ["--disable-modular-tests" "--with-libiconv"];
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
-
'';
81
76
82
77
preBuild = optionalString stdenv.isDarwin
83
78
''