Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248'

1 files changed, 21 insertions, 13 deletions

diff --git a/nixpkgs/pkgs/development/libraries/properties-cpp/default.nix b/nixpkgs/pkgs/development/libraries/properties-cpp/default.nix
index ce56c4645886..54fea18fd17e 100644
--- a/nixpkgs/pkgs/development/libraries/properties-cpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/properties-cpp/default.nix
@@ -1,27 +1,35 @@
-{ stdenv, fetchurl, cmake, pkgconfig, gtest, doxygen
-, graphviz, lcov }:
+{ stdenv
+, fetchurl
+, cmake
+, pkg-config
+, gtest
+, doxygen
+, graphviz
+, lcov
+}:
 
 stdenv.mkDerivation rec {
   pname = "properties-cpp";
   version = "0.0.1";
 
-  src = let srcver = version+"+14.10.20140730"; in
-  fetchurl {
-    url = "https://launchpad.net/ubuntu/+archive/primary/+files/${pname}_${srcver}.orig.tar.gz";
-    sha256 = "08vjyv7ibn6jh2ikj5v48kjpr3n6hlkp9qlvdn8r0vpiwzah0m2w";
-  };
-
-  buildInputs = [ cmake gtest doxygen pkgconfig graphviz lcov ];
+  src = let srcver = "${version}+14.10.20140730"; in
+    fetchurl {
+      url = "https://launchpad.net/ubuntu/+archive/primary/+files/${pname}_${srcver}.orig.tar.gz";
+      sha256 = "08vjyv7ibn6jh2ikj5v48kjpr3n6hlkp9qlvdn8r0vpiwzah0m2w";
+    };
 
-  patchPhase = ''
+  postPatch = ''
     sed -i "/add_subdirectory(tests)/d" CMakeLists.txt
   '';
 
+  nativeBuildInputs = [ cmake pkg-config ];
+
+  buildInputs = [ gtest doxygen graphviz lcov ];
+
   meta = with stdenv.lib; {
     homepage = "https://launchpad.net/properties-cpp";
-    description = "A very simple convenience library for handling properties and signals in C++11.";
-    license = licenses.lgpl3;
+    description = "A very simple convenience library for handling properties and signals in C++11";
+    license = licenses.lgpl3Only;
     maintainers = with maintainers; [ edwtjo ];
   };
-
 }