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

iniparser: 3.1 -> 4.0

Browse Source
This commit is contained in:
Michael Weiss 2017-10-20 20:37:36 +02:00 committed by Robin Gloster
parent 5c779de4a1
commit d61a58caea
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/development/libraries/iniparser/default.nix
View File

@ -1,18 +1,24 @@
{ stdenv, fetchurl }: { stdenv, fetchFromGitHub }:
let let
inherit (stdenv.lib) optional; inherit (stdenv.lib) optional;
in
stdenv.mkDerivation rec{
name = "iniparser-3.1";
src = fetchurl { in stdenv.mkDerivation rec {
url = "${meta.homepage}/iniparser-3.1.tar.gz"; name = "iniparser-${version}";
sha256 = "1igmxzcy0s25zcy9vmcw0kd13lh60r0b4qg8lnp1jic33f427pxf"; version = "4.0";
src = fetchFromGitHub {
owner = "ndevilla";
repo = "iniparser";
rev = "v${version}";
sha256 = "0339qa0qxa5z02xjcs5my8v91v0r9jm4piswrl1sa29kwyxgv5nb";
}; };
patches = ./no-usr.patch; patches = ./no-usr.patch;
doCheck = true;
preCheck = "patchShebangs test/make-tests.sh";
# TODO: Build dylib on Darwin # TODO: Build dylib on Darwin
buildFlags = (if stdenv.isDarwin then [ "libiniparser.a" ] else [ "libiniparser.so" ]) ++ [ "CC=cc" ]; buildFlags = (if stdenv.isDarwin then [ "libiniparser.a" ] else [ "libiniparser.so" ]) ++ [ "CC=cc" ];
@ -23,7 +29,7 @@ stdenv.mkDerivation rec{
cp src/*.h $out/include cp src/*.h $out/include
mkdir -p $out/share/doc/${name} mkdir -p $out/share/doc/${name}
for i in AUTHORS INSTALL LICENSE README; do for i in AUTHORS INSTALL LICENSE README.md; do
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}
@ -36,7 +42,7 @@ stdenv.mkDerivation rec{
''); '');
meta = { meta = {
homepage = http://ndevilla.free.fr/iniparser; inherit (src.meta) homepage;
description = "Free standalone ini file parsing library"; description = "Free standalone ini file parsing library";
license = stdenv.lib.licenses.mit; license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.unix; platforms = stdenv.lib.platforms.unix;

15
pkgs/development/libraries/iniparser/no-usr.patch
View File

@ -1,14 +1,13 @@
diff -urN iniparser3.0b.orig/Makefile iniparser3.0b/Makefile --- a/Makefile 2017-10-20 20:30:41.494608284 +0200
--- iniparser3.0b.orig/Makefile 2008-01-16 19:56:08.000000000 +0100 +++ b/Makefile 2017-10-20 20:33:22.279212026 +0200
+++ iniparser3.0b/Makefile 2008-01-16 19:56:49.000000000 +0100 @@ -20,8 +20,8 @@
@@ -11,8 +11,8 @@
ARFLAGS = rcv ARFLAGS = rcv
SHLD = ${CC} ${CFLAGS} SHLD = ${CC} ${CFLAGS}
-LDSHFLAGS = -shared -Wl,-Bsymbolic -Wl,-rpath -Wl,/usr/lib -Wl,-rpath,/usr/lib -LDSHFLAGS = -shared -Wl,-Bsymbolic
-LDFLAGS = -Wl,-rpath -Wl,/usr/lib -Wl,-rpath,/usr/lib -LDFLAGS += -Wl,-rpath -Wl,/usr/lib -Wl,-rpath,/usr/lib
+LDSHFLAGS = -shared +LDSHFLAGS = -shared
+LDFLAGS = +LDFLAGS =
# Set RANLIB to ranlib on systems that require it (Sun OS < 4, Mac OSX) # .so.0 is for version 3.x, .so.1 is 4.x
# RANLIB = ranlib SO_TARGET ?= libiniparser.so.1