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: 1c52824feda3
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 56bb1b0f7a33
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Dec 29, 2020

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

    @SuperSandro2000
    SuperSandro2000 committed Dec 29, 2020
    Copy the full SHA
    55fe467 View commit details

Commits on Jan 2, 2021

  1. Merge pull request #107863 from SuperSandro2000/properties-cpp-buildi… 

    …nputs

properties-cpp: move cmake, pkg-config to nativeBuildInputs, clean up
    @SuperSandro2000
    SuperSandro2000 authored Jan 2, 2021
    Copy the full SHA
    56bb1b0 View commit details
Showing with 20 additions and 12 deletions.
  1. +20 −12 pkgs/development/libraries/properties-cpp/default.nix
32 changes: 20 additions & 12 deletions pkgs/development/libraries/properties-cpp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
license = licenses.lgpl3Only;
maintainers = with maintainers; [ edwtjo ];
};

}