Merge commit '83ba5afcc9682b52b39a9a958f730b966cc369c5'

1 files changed, 19 insertions, 11 deletions

diff --git a/nixpkgs/pkgs/development/libraries/theft/default.nix b/nixpkgs/pkgs/development/libraries/theft/default.nix
index 881f9c033a38..8d72d9a7d8ec 100644
--- a/nixpkgs/pkgs/development/libraries/theft/default.nix
+++ b/nixpkgs/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 ];
   };
 }