tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
0
fork
atom
lol
0
fork
atom
overview
issues
pulls
pipelines
pkgconfig: fix cygwin build
David McFarland
8 years ago
bf517c1c
f4a2351b
+14
-1
2 changed files
expand all
collapse all
unified
split
pkgs
development
tools
misc
pkgconfig
2.36.3-not-win32.patch
default.nix
+13
pkgs/development/tools/misc/pkgconfig/2.36.3-not-win32.patch
reviewed
···
309
309
# else
310
310
311
311
/* On old systems which lack it, use setlocale or getenv. */
312
312
+
diff --git a/glib/gtypes.h b/glib/gtypes.h
313
313
+
index c18e0bf..816685a 100644
314
314
+
--- a/glib/glib/gtypes.h
315
315
+
+++ b/glib/glib/gtypes.h
316
316
+
@@ -462,7 +462,7 @@ G_END_DECLS
317
317
+
* properly get exported in Windows DLLs.
318
318
+
*/
319
319
+
#ifndef GLIB_VAR
320
320
+
-# ifdef G_PLATFORM_WIN32
321
321
+
+# ifdef G_OS_WIN32
322
322
+
# ifdef GLIB_STATIC_COMPILATION
323
323
+
# define GLIB_VAR extern
324
324
+
# else /* !GLIB_STATIC_COMPILATION */
+1
-1
pkgs/development/tools/misc/pkgconfig/default.nix
reviewed
···
26
26
configureFlags = [ "--with-internal-glib" ]
27
27
++ optional (stdenv.isSunOS) [ "--with-libiconv=gnu" "--with-system-library-path" "--with-system-include-path" "CFLAGS=-DENABLE_NLS" ];
28
28
29
29
-
postInstall = ''rm "$out"/bin/*-pkg-config''; # clean the duplicate file
29
29
+
postInstall = ''rm -f "$out"/bin/*-pkg-config''; # clean the duplicate file
30
30
31
31
meta = {
32
32
description = "A tool that allows packages to find out information about other packages";