From a7ca9c2105e99e241d6b7e105de4e43ae9a2277d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 19 Jan 2016 17:39:35 +0100 Subject: [PATCH] Revert "glib: fix compilation on SmartOS/Illumos (close #12477)" This reverts commit 3f9ff30f6d3972b2dada00b022b1bced8f83cd42. Let's go without changing hash instead: e67717bc8d545c --- pkgs/development/libraries/glib/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 47ed65eb561..538a40615f1 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -68,17 +68,12 @@ stdenv.mkDerivation rec { configureFlags = optional stdenv.isDarwin "--disable-compile-warnings" - ++ optional (stdenv.isFreeBSD || stdenv.isSunOS) "--with-libiconv=gnu" - ++ optional stdenv.isSunOS "--disable-dtrace"; + ++ optional stdenv.isFreeBSD "--with-libiconv=gnu" + ++ optional stdenv.isSunOS ["--disable-modular-tests" "--with-libiconv"]; NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl" + optionalString stdenv.isSunOS " -DBSD_COMP"; - preConfigure = optionalString stdenv.isSunOS - '' - sed -i -e 's|inotify.h|foobar-inotify.h|g' configure - ''; - preBuild = optionalString stdenv.isDarwin '' export MACOSX_DEPLOYMENT_TARGET=