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

Merge pull request #33575 from dtzWill/fix/cross-1

Browse Source 
Minor cross fixes, 1
This commit is contained in:
John Ericson
2018-01-09 12:34:50 -05:00
committed by GitHub
parent 73303b592d 6db707fe7e
commit 0c16a11c9a
7 changed files with 36 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/tools/misc/pkgconfig/default.nix
View File

@@ -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