From c6830326b21063e9b30782d1d395953cac5a05f8 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 16 Jun 2019 01:26:09 -0500 Subject: [PATCH] theft: 0.4.4 -> 0.4.5, fix pkg-config file The libtheft.pc file was using prefix=/usr/local for its own relative -L/-l/-I parameters for GCC, giving incorrect results. (This is really more of an upstream bug.) This also adds myself to the maintainer list, and enables builds on non-Linux platforms. Signed-off-by: Austin Seipp --- pkgs/development/libraries/theft/default.nix | 30 +++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/theft/default.nix b/pkgs/development/libraries/theft/default.nix index 881f9c033a3..8d72d9a7d8e 100644 --- a/pkgs/development/libraries/theft/default.nix +++ b/pkgs/development/libraries/theft/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "0.4.4"; + version = "0.4.5"; name = "theft-${version}"; src = fetchFromGitHub { - owner = "silentbicycle"; - repo = "theft"; - rev = "v${version}"; - sha256 = "1csdhnb10k7vsyd44vjpg430nf6a909wj8af2zawdkbvnxn5wxc4"; + owner = "silentbicycle"; + repo = "theft"; + rev = "v${version}"; + sha256 = "1n2mkawfl2bpd4pwy3mdzxwlqjjvb5bdrr2x2gldlyqdwbk7qjhd"; }; preConfigure = "patchShebangs ./scripts/mk_bits_lut"; @@ -17,13 +17,21 @@ stdenv.mkDerivation rec { checkTarget = "test"; installFlags = [ "PREFIX=$(out)" ]; - postInstall = "install -m644 vendor/greatest.h $out/include/"; + + # fix the libtheft.pc file to use the right installation + # directory. should be fixed upstream, too + postInstall = '' + install -m644 vendor/greatest.h $out/include/ + + substituteInPlace $out/lib/pkgconfig/libtheft.pc \ + --replace "/usr/local" "$out" + ''; - meta = { + meta = with stdenv.lib; { description = "A C library for property-based testing"; - platforms = stdenv.lib.platforms.linux; - homepage = "https://github.com/silentbicycle/theft/"; - license = stdenv.lib.licenses.isc; - maintainers = [ stdenv.lib.maintainers.kquick ]; + homepage = "https://github.com/silentbicycle/theft/"; + platforms = platforms.unix; + license = licenses.isc; + maintainers = with maintainers; [ kquick thoughtpolice ]; }; }