diff options
| author | David McFarland <corngood@gmail.com> | 2017-06-09 10:58:48 -0300 |
|---|---|---|
| committer | David McFarland <corngood@gmail.com> | 2017-06-26 09:33:35 -0300 |
| commit | bf517c1c16e49f25aca3318ad03335e3b39f2929 (patch) | |
| tree | 289df980b680ab50fdaef2f07afca3a9a2e34b2d | |
| parent | f4a2351b2b8f89797528fd6d40d502c23d132e44 (diff) | |
| download | nixpkgs-bf517c1c16e49f25aca3318ad03335e3b39f2929.tar nixpkgs-bf517c1c16e49f25aca3318ad03335e3b39f2929.tar.gz nixpkgs-bf517c1c16e49f25aca3318ad03335e3b39f2929.tar.bz2 nixpkgs-bf517c1c16e49f25aca3318ad03335e3b39f2929.tar.lz nixpkgs-bf517c1c16e49f25aca3318ad03335e3b39f2929.tar.xz nixpkgs-bf517c1c16e49f25aca3318ad03335e3b39f2929.tar.zst nixpkgs-bf517c1c16e49f25aca3318ad03335e3b39f2929.zip | |
pkgconfig: fix cygwin build
| -rw-r--r-- | pkgs/development/tools/misc/pkgconfig/2.36.3-not-win32.patch | 13 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/pkgconfig/default.nix | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/pkgs/development/tools/misc/pkgconfig/2.36.3-not-win32.patch b/pkgs/development/tools/misc/pkgconfig/2.36.3-not-win32.patch index 246173d465a..c1dd808e600 100644 --- a/pkgs/development/tools/misc/pkgconfig/2.36.3-not-win32.patch +++ b/pkgs/development/tools/misc/pkgconfig/2.36.3-not-win32.patch @@ -309,3 +309,16 @@ # else /* On old systems which lack it, use setlocale or getenv. */ +diff --git a/glib/gtypes.h b/glib/gtypes.h +index c18e0bf..816685a 100644 +--- a/glib/glib/gtypes.h ++++ b/glib/glib/gtypes.h +@@ -462,7 +462,7 @@ G_END_DECLS + * properly get exported in Windows DLLs. + */ + #ifndef GLIB_VAR +-# ifdef G_PLATFORM_WIN32 ++# ifdef G_OS_WIN32 + # ifdef GLIB_STATIC_COMPILATION + # define GLIB_VAR extern + # else /* !GLIB_STATIC_COMPILATION */ diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix index 10358df69c2..5be42855a9c 100644 --- a/pkgs/development/tools/misc/pkgconfig/default.nix +++ b/pkgs/development/tools/misc/pkgconfig/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-internal-glib" ] ++ optional (stdenv.isSunOS) [ "--with-libiconv=gnu" "--with-system-library-path" "--with-system-include-path" "CFLAGS=-DENABLE_NLS" ]; - postInstall = ''rm "$out"/bin/*-pkg-config''; # clean the duplicate file + postInstall = ''rm -f "$out"/bin/*-pkg-config''; # clean the duplicate file meta = { description = "A tool that allows packages to find out information about other packages"; |