diff options
author | Benjamin Hipple <bhipple@protonmail.com> | 2019-02-24 15:39:19 -0500 |
---|---|---|
committer | Lassulus <github@lassul.us> | 2019-05-15 02:13:13 +0900 |
commit | 6d8b114efaa0c6ccbfcc5961991a34ba7ef7eca1 (patch) | |
tree | 95dc286049ff635a7d2ae9397e52e1ca0745b68f /pkgs/development/tools/misc/pkg-config | |
parent | 678efddd57be079d4fa7744065f211c1cc0a192f (diff) | |
download | nixpkgs-6d8b114efaa0c6ccbfcc5961991a34ba7ef7eca1.tar nixpkgs-6d8b114efaa0c6ccbfcc5961991a34ba7ef7eca1.tar.gz nixpkgs-6d8b114efaa0c6ccbfcc5961991a34ba7ef7eca1.tar.bz2 nixpkgs-6d8b114efaa0c6ccbfcc5961991a34ba7ef7eca1.tar.lz nixpkgs-6d8b114efaa0c6ccbfcc5961991a34ba7ef7eca1.tar.xz nixpkgs-6d8b114efaa0c6ccbfcc5961991a34ba7ef7eca1.tar.zst nixpkgs-6d8b114efaa0c6ccbfcc5961991a34ba7ef7eca1.zip |
pkg-config: enable check
The pkg-config test suite does pass, except for 3 tests related to functionality we've modified regarding Requires.private and --static.
Diffstat (limited to 'pkgs/development/tools/misc/pkg-config')
-rw-r--r-- | pkgs/development/tools/misc/pkg-config/default.nix | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/pkgs/development/tools/misc/pkg-config/default.nix b/pkgs/development/tools/misc/pkg-config/default.nix index 81fb7f8b13f..13855eb4e74 100644 --- a/pkgs/development/tools/misc/pkg-config/default.nix +++ b/pkgs/development/tools/misc/pkg-config/default.nix @@ -1,24 +1,28 @@ -{stdenv, fetchurl, libiconv, vanilla ? false }: +{ stdenv, fetchurl, libiconv, vanilla ? false }: with stdenv.lib; stdenv.mkDerivation rec { - name = "pkg-config-0.29.2"; + pname = "pkg-config"; + version = "0.29.2"; setupHook = ./setup-hook.sh; src = fetchurl { - urls = [ - "https://pkgconfig.freedesktop.org/releases/${name}.tar.gz" - "http://fossies.org/linux/misc/${name}.tar.gz" - ]; + url = "https://pkgconfig.freedesktop.org/releases/${pname}-${version}.tar.gz"; sha256 = "14fmwzki1rlz8bs2p810lk6jqdxsk966d8drgsjmi54cd00rrikg"; }; - # Process Requires.private properly, see - # http://bugs.freedesktop.org/show_bug.cgi?id=4738. + + # Process Requires.private properly, see + # http://bugs.freedesktop.org/show_bug.cgi?id=4738. patches = optional (!vanilla) ./requires-private.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; configureFlags = [ "--with-internal-glib" ] @@ -31,7 +35,8 @@ stdenv.mkDerivation rec { "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 @@ -41,5 +46,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; license = licenses.gpl2Plus; }; - } |