diff options
| author | Luca Bruno <lethalman88@gmail.com> | 2015-12-11 18:31:00 +0100 |
|---|---|---|
| committer | Luca Bruno <lethalman88@gmail.com> | 2015-12-11 18:31:00 +0100 |
| commit | 5b0352a6a43fdd924a53cde4b81c15b755fa0a27 (patch) | |
| tree | cf0fcc2be2f6d08c970f0322a63ff0a31d5d5dee /pkgs/development/tools/misc/pkgconfig | |
| parent | 2f0fe05543ce594eacf0310966914d6e19a42f88 (diff) | |
| parent | 146784f835a6cadc65812c5adf76533c18e5be61 (diff) | |
| download | nixlib-5b0352a6a43fdd924a53cde4b81c15b755fa0a27.tar nixlib-5b0352a6a43fdd924a53cde4b81c15b755fa0a27.tar.gz nixlib-5b0352a6a43fdd924a53cde4b81c15b755fa0a27.tar.bz2 nixlib-5b0352a6a43fdd924a53cde4b81c15b755fa0a27.tar.lz nixlib-5b0352a6a43fdd924a53cde4b81c15b755fa0a27.tar.xz nixlib-5b0352a6a43fdd924a53cde4b81c15b755fa0a27.tar.zst nixlib-5b0352a6a43fdd924a53cde4b81c15b755fa0a27.zip | |
Merge branch 'master' into closure-size
Diffstat (limited to 'pkgs/development/tools/misc/pkgconfig')
| -rw-r--r-- | pkgs/development/tools/misc/pkgconfig/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix index 127223c4ee15..c98bddf53c09 100644 --- a/pkgs/development/tools/misc/pkgconfig/default.nix +++ b/pkgs/development/tools/misc/pkgconfig/default.nix @@ -17,12 +17,12 @@ stdenv.mkDerivation rec { patches = optional (!vanilla) ./requires-private.patch ++ optional stdenv.isCygwin ./2.36.3-not-win32.patch; - buildInputs = optional (stdenv.isCygwin || stdenv.isDarwin) libiconv; - preConfigure = stdenv.lib.optionalString (stdenv.system == "mips64el-linux") ''cp -v ${automake}/share/automake*/config.{sub,guess} .''; + buildInputs = stdenv.lib.optional (stdenv.isCygwin || stdenv.isDarwin || stdenv.isSunOS) libiconv; - configureFlags = [ "--with-internal-glib" ]; + configureFlags = [ "--with-internal-glib" ] + ++ stdenv.lib.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 |