diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2018-01-09 12:34:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-09 12:34:50 -0500 |
| commit | 0c16a11c9aee51fd2f1603d7f7bc2c5a6c8bfaaa (patch) | |
| tree | bccffe22fdb7f880e8b722f4909e119c40b4a3d0 /pkgs/development/tools | |
| parent | 73303b592d62ef81c23371b09767bcf3f9cf16e3 (diff) | |
| parent | 6db707fe7e0b65afb9c306b798e1aeae743f1b51 (diff) | |
| download | nixlib-0c16a11c9aee51fd2f1603d7f7bc2c5a6c8bfaaa.tar nixlib-0c16a11c9aee51fd2f1603d7f7bc2c5a6c8bfaaa.tar.gz nixlib-0c16a11c9aee51fd2f1603d7f7bc2c5a6c8bfaaa.tar.bz2 nixlib-0c16a11c9aee51fd2f1603d7f7bc2c5a6c8bfaaa.tar.lz nixlib-0c16a11c9aee51fd2f1603d7f7bc2c5a6c8bfaaa.tar.xz nixlib-0c16a11c9aee51fd2f1603d7f7bc2c5a6c8bfaaa.tar.zst nixlib-0c16a11c9aee51fd2f1603d7f7bc2c5a6c8bfaaa.zip | |
Merge pull request #33575 from dtzWill/fix/cross-1
Minor cross fixes, 1
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/misc/pkgconfig/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix index 5be42855a9c7..7cfd78a39a28 100644 --- a/pkgs/development/tools/misc/pkgconfig/default.nix +++ b/pkgs/development/tools/misc/pkgconfig/default.nix @@ -24,7 +24,15 @@ stdenv.mkDerivation rec { buildInputs = optional (stdenv.isCygwin || stdenv.isDarwin || stdenv.isSunOS) libiconv; configureFlags = [ "--with-internal-glib" ] - ++ optional (stdenv.isSunOS) [ "--with-libiconv=gnu" "--with-system-library-path" "--with-system-include-path" "CFLAGS=-DENABLE_NLS" ]; + ++ optional (stdenv.isSunOS) [ "--with-libiconv=gnu" "--with-system-library-path" "--with-system-include-path" "CFLAGS=-DENABLE_NLS" ] + # Can't run these tests while cross-compiling + ++ optional (stdenv.hostPlatform != stdenv.buildPlatform) + [ "glib_cv_stack_grows=no" + "glib_cv_uscore=no" + "ac_cv_func_posix_getpwuid_r=yes" + "ac_cv_func_posix_getgrgid_r=yes" + ]; + postInstall = ''rm -f "$out"/bin/*-pkg-config''; # clean the duplicate file |