diff options
| author | Danny Wilson <danny@prime.vc> | 2016-01-19 15:59:10 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-01-19 17:38:44 +0100 |
| commit | e67717bc8d545c593f974163a8a496f5f898b73d (patch) | |
| tree | 3624a7fedb3daecabf7f4d7f77e8ddbdaa0b2efd /pkgs/development/libraries/glib/default.nix | |
| parent | d51204e8dec7995bc4cb44f5776102258e713e1e (diff) | |
| download | nixpkgs-e67717bc8d545c593f974163a8a496f5f898b73d.tar nixpkgs-e67717bc8d545c593f974163a8a496f5f898b73d.tar.gz nixpkgs-e67717bc8d545c593f974163a8a496f5f898b73d.tar.bz2 nixpkgs-e67717bc8d545c593f974163a8a496f5f898b73d.tar.lz nixpkgs-e67717bc8d545c593f974163a8a496f5f898b73d.tar.xz nixpkgs-e67717bc8d545c593f974163a8a496f5f898b73d.tar.zst nixpkgs-e67717bc8d545c593f974163a8a496f5f898b73d.zip | |
glib: fix compilation on SmartOS/Illumos (close #12479)
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`.
Diffstat (limited to 'pkgs/development/libraries/glib/default.nix')
| -rw-r--r-- | pkgs/development/libraries/glib/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 538a40615f1..9a3303684a1 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -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= |