1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-22 14:45:27 +00:00

cygwin: popt patches

This commit is contained in:
U-user-PC\\user 2014-10-26 15:27:39 +01:00 committed by Rok Garbas
parent 7f7aca4e16
commit 6c7899b1f6
3 changed files with 51 additions and 1 deletions

View file

@ -0,0 +1,11 @@
--- origsrc/poptconfig.c 2009-05-20 08:18:07.000000000 -0500
+++ src/poptconfig.c 2012-03-29 18:13:46.869286100 -0500
@@ -42,7 +42,7 @@ extern int glob_pattern_p (const char *_
/*@=declundef =exportheader =incondefs =protoparammatch =redecl =type @*/
#endif /* __LCLINT__ */
-#if !defined(__GLIBC__)
+#if !defined(__GLIBC__) && !defined(__CYGWIN__)
/* Return nonzero if PATTERN contains any metacharacters.
Metacharacters can be quoted with backslashes if QUOTE is nonzero. */
static int

View file

@ -0,0 +1,34 @@
--- origsrc/Doxyfile.in 2008-04-26 16:57:32.000000000 -0500
+++ src/Doxyfile.in 2012-03-29 18:15:56.649709100 -0500
@@ -460,14 +460,14 @@ WARN_LOGFILE =
# with spaces.
INPUT = \
- ./popt.c \
- ./popt.h \
- ./poptconfig.c \
- ./popthelp.c \
- ./poptint.c \
- ./poptint.h \
- ./poptparse.c \
- ./system.h
+ @srcdir@/popt.c \
+ @srcdir@/popt.h \
+ @srcdir@/poptconfig.c \
+ @srcdir@/popthelp.c \
+ @srcdir@/poptint.c \
+ @srcdir@/poptint.h \
+ @srcdir@/poptparse.c \
+ @srcdir@/system.h
# If the value of the INPUT tag contains directories, you can use the
# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
@@ -658,7 +658,7 @@ HTML_HEADER =
# each generated HTML page. If it is left blank doxygen will generate a
# standard footer.
-HTML_FOOTER = footer_no_timestamp.html
+HTML_FOOTER = @srcdir@/footer_no_timestamp.html
# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
# style sheet that is used by each HTML page. It can be used to

View file

@ -2,12 +2,17 @@
stdenv.mkDerivation rec {
name = "popt-1.16";
src = fetchurl {
url = "http://rpm5.org/files/popt/${name}.tar.gz";
sha256 = "1j2c61nn2n351nhj4d25mnf3vpiddcykq005w2h6kw79dwlysa77";
};
patches = if stdenv.isCygwin then [
./1.16-cygwin.patch
./1.16-vpath.patch
] else null;
meta = {
description = "command line option parsing library";
};