pkgconfig: post-merge fixup
This commit is contained in:
parent
f72376fd20
commit
2b67ba2ad2
|
@ -14,17 +14,17 @@ stdenv.mkDerivation rec {
|
||||||
};
|
};
|
||||||
# Process Requires.private properly, see
|
# Process Requires.private properly, see
|
||||||
# http://bugs.freedesktop.org/show_bug.cgi?id=4738.
|
# http://bugs.freedesktop.org/show_bug.cgi?id=4738.
|
||||||
patches = optional (!vanilla) ./requires-private.patch;
|
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")
|
preConfigure = stdenv.lib.optionalString (stdenv.system == "mips64el-linux")
|
||||||
''cp -v ${automake}/share/automake*/config.{sub,guess} .'';
|
''cp -v ${automake}/share/automake*/config.{sub,guess} .'';
|
||||||
|
|
||||||
buildInputs = optional (stdenv.isCygwin || stdenv.isDarwin) libiconv;
|
|
||||||
|
|
||||||
configureFlags = [ "--with-internal-glib" ];
|
configureFlags = [ "--with-internal-glib" ];
|
||||||
|
|
||||||
postInstall = ''rm "$out"/bin/*-pkg-config''; # clean the duplicate file
|
postInstall = ''rm "$out"/bin/*-pkg-config''; # clean the duplicate file
|
||||||
patches = optional stdenv.isCygwin ./2.36.3-not-win32.patch;
|
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "A tool that allows packages to find out information about other packages";
|
description = "A tool that allows packages to find out information about other packages";
|
||||||
|
|
Loading…
Reference in a new issue