Merge pull request #7246 from spwhitt/iniparser
iniparser: fix Darwin by building static lib
This commit is contained in:
commit
cdb14ddafe
|
@ -1,5 +1,9 @@
|
||||||
{ stdenv, fetchurl }:
|
{ stdenv, fetchurl }:
|
||||||
|
|
||||||
|
let
|
||||||
|
inherit (stdenv.lib) optional;
|
||||||
|
isClang = (stdenv.cc.cc.isClang or false);
|
||||||
|
in
|
||||||
stdenv.mkDerivation rec{
|
stdenv.mkDerivation rec{
|
||||||
name = "iniparser-3.1";
|
name = "iniparser-3.1";
|
||||||
|
|
||||||
|
@ -10,12 +14,12 @@ stdenv.mkDerivation rec{
|
||||||
|
|
||||||
patches = ./no-usr.patch;
|
patches = ./no-usr.patch;
|
||||||
|
|
||||||
buildFlags = "libiniparser.so";
|
# TODO: Build dylib on Darwin
|
||||||
|
buildFlags = (if stdenv.isDarwin then [ "libiniparser.a" ] else [ "libiniparser.so" ])
|
||||||
|
++ optional isClang "CC=clang";
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
mkdir -p $out/lib
|
mkdir -p $out/lib
|
||||||
cp libiniparser.so.0 $out/lib
|
|
||||||
ln -s libiniparser.so.0 $out/lib/libiniparser.so
|
|
||||||
|
|
||||||
mkdir -p $out/include
|
mkdir -p $out/include
|
||||||
cp src/*.h $out/include
|
cp src/*.h $out/include
|
||||||
|
@ -25,7 +29,13 @@ stdenv.mkDerivation rec{
|
||||||
bzip2 -c -9 $i > $out/share/doc/${name}/$i.bz2;
|
bzip2 -c -9 $i > $out/share/doc/${name}/$i.bz2;
|
||||||
done;
|
done;
|
||||||
cp -r html $out/share/doc/${name}
|
cp -r html $out/share/doc/${name}
|
||||||
'';
|
|
||||||
|
'' + (if stdenv.isDarwin then ''
|
||||||
|
cp libiniparser.a $out/lib
|
||||||
|
'' else ''
|
||||||
|
cp libiniparser.so.0 $out/lib
|
||||||
|
ln -s libiniparser.so.0 $out/lib/libiniparser.so
|
||||||
|
'');
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = http://ndevilla.free.fr/iniparser;
|
homepage = http://ndevilla.free.fr/iniparser;
|
||||||
|
|
Loading…
Reference in New Issue