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

pkg-config: enable check

Browse Source 
The pkg-config test suite does pass, except for 3 tests related to functionality
we've modified regarding Requires.private and --static.
This commit is contained in:
Benjamin Hipple 2019-02-24 15:39:19 -05:00 committed by Lassulus
parent 678efddd57
commit 6d8b114efa
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/development/tools/misc/pkg-config/default.nix
View File

@ -1,24 +1,28 @@
{stdenv, fetchurl, libiconv, vanilla ? false }: { stdenv, fetchurl, libiconv, vanilla ? false }:
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pkg-config-0.29.2"; pname = "pkg-config";
version = "0.29.2";
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
src = fetchurl { src = fetchurl {
urls = [ url = "https://pkgconfig.freedesktop.org/releases/${pname}-${version}.tar.gz";
"https://pkgconfig.freedesktop.org/releases/${name}.tar.gz"
"http://fossies.org/linux/misc/${name}.tar.gz"
];
sha256 = "14fmwzki1rlz8bs2p810lk6jqdxsk966d8drgsjmi54cd00rrikg"; sha256 = "14fmwzki1rlz8bs2p810lk6jqdxsk966d8drgsjmi54cd00rrikg";
}; };
# 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; ++ optional stdenv.isCygwin ./2.36.3-not-win32.patch;
# These three tests fail due to a (desired) behavior change from our ./requires-private.patch
postPatch = ''
rm -f check/check-requires-private check/check-gtk check/missing
'';
buildInputs = optional (stdenv.isCygwin || stdenv.isDarwin || stdenv.isSunOS) libiconv; buildInputs = optional (stdenv.isCygwin || stdenv.isDarwin || stdenv.isSunOS) libiconv;
configureFlags = [ "--with-internal-glib" ] configureFlags = [ "--with-internal-glib" ]
@ -31,7 +35,8 @@ stdenv.mkDerivation rec {
"ac_cv_func_posix_getgrgid_r=yes" "ac_cv_func_posix_getgrgid_r=yes"
]; ];
doCheck = false; # fails enableParallelBuilding = true;
doCheck = true;
postInstall = ''rm -f "$out"/bin/*-pkg-config''; # clean the duplicate file postInstall = ''rm -f "$out"/bin/*-pkg-config''; # clean the duplicate file
@ -41,5 +46,4 @@ stdenv.mkDerivation rec {
platforms = platforms.all; platforms = platforms.all;
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
}; };
} }