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

Revert "glib: fix compilation on SmartOS/Illumos (close #12477)"

Browse Source 
This reverts commit 3f9ff30f6d3972b2dada00b022b1bced8f83cd42.
Let's go without changing hash instead: e67717bc8d545c
This commit is contained in:
Vladimír Čunát 2016-01-19 17:39:35 +01:00
parent 3f9ff30f6d
commit a7ca9c2105
1 changed files with 2 additions and 7 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,17 +68,12 @@ stdenv.mkDerivation rec {
configureFlags = configureFlags =
optional stdenv.isDarwin "--disable-compile-warnings" optional stdenv.isDarwin "--disable-compile-warnings"
++ optional (stdenv.isFreeBSD || stdenv.isSunOS) "--with-libiconv=gnu" ++ optional stdenv.isFreeBSD "--with-libiconv=gnu"
++ optional stdenv.isSunOS "--disable-dtrace"; ++ optional stdenv.isSunOS ["--disable-modular-tests" "--with-libiconv"];
NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl" NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl"
+ optionalString stdenv.isSunOS " -DBSD_COMP"; + optionalString stdenv.isSunOS " -DBSD_COMP";
preConfigure = optionalString stdenv.isSunOS
''
sed -i -e 's|inotify.h|foobar-inotify.h|g' configure
'';
preBuild = optionalString stdenv.isDarwin preBuild = optionalString stdenv.isDarwin
'' ''
export MACOSX_DEPLOYMENT_TARGET= export MACOSX_DEPLOYMENT_TARGET=