Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 678efddd57be
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6d8b114efaa0
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on May 14, 2019

  1. 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.
    @bhipple @Lassulus
    bhipple authored and Lassulus committed May 14, 2019
    Copy the full SHA
    6d8b114 View commit details
Showing with 14 additions and 10 deletions.
  1. +14 −10 pkgs/development/tools/misc/pkg-config/default.nix
24 changes: 14 additions & 10 deletions pkgs/development/tools/misc/pkg-config/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
};

}