git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #107863 from SuperSandro2000/properties-cpp-buildinputs

properties-cpp: move cmake, pkg-config to nativeBuildInputs, clean up

commit56bb1b0f7a33e5d487dc2bf2e846794f4dcb4d01 authorSandro <sandro.jaeckel@gmail.com> dateSat 2 Jan 2021, 10:49 (6 years ago) parent1c5282455fe467
1 file changed+20−12
pkgs/development/libraries/properties-cpp/default.nix+20−12
pkgs/development/libraries/properties-cpp/default.nix+20−12
@@ -1,27 +1,35 @@
1−{ stdenv, fetchurl, cmake, pkgconfig, gtest, doxygen
2−, graphviz, lcov }:
1+{ stdenv
2+, fetchurl
3+, cmake
4+, pkg-config
5+, gtest
6+, doxygen
7+, graphviz
8+, lcov
9+}:
310
411stdenv.mkDerivation rec {
512 pname = "properties-cpp";
613 version = "0.0.1";
714
8− src = let srcver = version+"+14.10.20140730"; in
9− fetchurl {
10− url = "https://launchpad.net/ubuntu/+archive/primary/+files/${pname}_${srcver}.orig.tar.gz";
11− sha256 = "08vjyv7ibn6jh2ikj5v48kjpr3n6hlkp9qlvdn8r0vpiwzah0m2w";
12− };
13−
14− buildInputs = [ cmake gtest doxygen pkgconfig graphviz lcov ];
15+ src = let srcver = "${version}+14.10.20140730"; in
16+ fetchurl {
17+ url = "https://launchpad.net/ubuntu/+archive/primary/+files/${pname}_${srcver}.orig.tar.gz";
18+ sha256 = "08vjyv7ibn6jh2ikj5v48kjpr3n6hlkp9qlvdn8r0vpiwzah0m2w";
19+ };
1520
16− patchPhase = ''
21+ postPatch = ''
1722 sed -i "/add_subdirectory(tests)/d" CMakeLists.txt
1823 '';
1924
25+ nativeBuildInputs = [ cmake pkg-config ];
26+
27+ buildInputs = [ gtest doxygen graphviz lcov ];
28+
2029 meta = with stdenv.lib; {
2130 homepage = "https://launchpad.net/properties-cpp";
2231 description = "A very simple convenience library for handling properties and signals in C++11";
23− license = licenses.lgpl3;
32+ license = licenses.lgpl3Only;
2433 maintainers = with maintainers; [ edwtjo ];
2534 };
26−
2735}