Merge pull request #7246 from spwhitt/iniparser

iniparser: fix Darwin by building static lib

+14 -4
+14 -4
pkgs/development/libraries/iniparser/default.nix
··· 1 { stdenv, fetchurl }: 2 3 stdenv.mkDerivation rec{ 4 name = "iniparser-3.1"; 5 ··· 10 11 patches = ./no-usr.patch; 12 13 - buildFlags = "libiniparser.so"; 14 15 installPhase = '' 16 mkdir -p $out/lib 17 - cp libiniparser.so.0 $out/lib 18 - ln -s libiniparser.so.0 $out/lib/libiniparser.so 19 20 mkdir -p $out/include 21 cp src/*.h $out/include ··· 25 bzip2 -c -9 $i > $out/share/doc/${name}/$i.bz2; 26 done; 27 cp -r html $out/share/doc/${name} 28 - ''; 29 30 meta = { 31 homepage = http://ndevilla.free.fr/iniparser;
··· 1 { stdenv, fetchurl }: 2 3 + let 4 + inherit (stdenv.lib) optional; 5 + isClang = (stdenv.cc.cc.isClang or false); 6 + in 7 stdenv.mkDerivation rec{ 8 name = "iniparser-3.1"; 9 ··· 14 15 patches = ./no-usr.patch; 16 17 + # TODO: Build dylib on Darwin 18 + buildFlags = (if stdenv.isDarwin then [ "libiniparser.a" ] else [ "libiniparser.so" ]) 19 + ++ optional isClang "CC=clang"; 20 21 installPhase = '' 22 mkdir -p $out/lib 23 24 mkdir -p $out/include 25 cp src/*.h $out/include ··· 29 bzip2 -c -9 $i > $out/share/doc/${name}/$i.bz2; 30 done; 31 cp -r html $out/share/doc/${name} 32 + 33 + '' + (if stdenv.isDarwin then '' 34 + cp libiniparser.a $out/lib 35 + '' else '' 36 + cp libiniparser.so.0 $out/lib 37 + ln -s libiniparser.so.0 $out/lib/libiniparser.so 38 + ''); 39 40 meta = { 41 homepage = http://ndevilla.free.fr/iniparser;