iniparser: 4.0 -> 4.1

This commit is contained in:
Michael Weiss 2017-11-07 08:47:48 +01:00
parent 0de572b7d3
commit 52d6eecc24

View File

@ -1,17 +1,14 @@
{ stdenv, fetchFromGitHub }: { stdenv, fetchFromGitHub }:
let stdenv.mkDerivation rec {
inherit (stdenv.lib) optional;
in stdenv.mkDerivation rec {
name = "iniparser-${version}"; name = "iniparser-${version}";
version = "4.0"; version = "4.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ndevilla"; owner = "ndevilla";
repo = "iniparser"; repo = "iniparser";
rev = "v${version}"; rev = "v${version}";
sha256 = "0339qa0qxa5z02xjcs5my8v91v0r9jm4piswrl1sa29kwyxgv5nb"; sha256 = "0dhab6pad6wh816lr7r3jb6z273njlgw2vpw8kcfnmi7ijaqhnr5";
}; };
patches = ./no-usr.patch; patches = ./no-usr.patch;
@ -19,9 +16,6 @@ in stdenv.mkDerivation rec {
doCheck = true; doCheck = true;
preCheck = "patchShebangs test/make-tests.sh"; preCheck = "patchShebangs test/make-tests.sh";
# TODO: Build dylib on Darwin
buildFlags = (if stdenv.isDarwin then [ "libiniparser.a" ] else [ "libiniparser.so" ]) ++ [ "CC=cc" ];
installPhase = '' installPhase = ''
mkdir -p $out/lib mkdir -p $out/lib
@ -34,17 +28,16 @@ in stdenv.mkDerivation rec {
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 cp libiniparser.a $out/lib
'' else '' cp libiniparser.so.1 $out/lib
cp libiniparser.so.0 $out/lib ln -s libiniparser.so.1 $out/lib/libiniparser.so
ln -s libiniparser.so.0 $out/lib/libiniparser.so '';
'');
meta = { meta = with stdenv.lib; {
inherit (src.meta) homepage; inherit (src.meta) homepage;
description = "Free standalone ini file parsing library"; description = "Free standalone ini file parsing library";
license = stdenv.lib.licenses.mit; license = licenses.mit;
platforms = stdenv.lib.platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.primeos ];
}; };
} }