git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #118391 from dotlambda/openzwave-official

openzwave: use official version

commitc6bd90d48fbb60297c9406edc1693b7aa66cd33b authorRobert Schütz <dev@schuetz-co.de> dateThu 8 Apr 2021, 19:02 (6 years ago) parent9e377a6c435971
2 files changed+39−29
pkgs/development/libraries/openzwave/default.nix+24−27 pkgs/development/python-modules/homeassistant-pyozw/default.nix+15−2
pkgs/development/libraries/openzwave/default.nix+24−27
@@ -1,23 +1,33 @@
1−{ lib, stdenv, fetchFromGitHub
1+{ lib, stdenv, fetchFromGitHub, fetchpatch
22, doxygen, fontconfig, graphviz-nox, libxml2, pkg-config, which
33, systemd }:
44
5−let
6− version = "2019-12-08";
7−
8−in stdenv.mkDerivation {
5+stdenv.mkDerivation rec {
96 pname = "openzwave";
10− inherit version;
7+ version = "1.6";
118
12− # Use fork by Home Assistant because this package is mainly used for python.pkgs.homeassistant-pyozw.
13− # See https://github.com/OpenZWave/open-zwave/compare/master...home-assistant:hass for the difference.
149 src = fetchFromGitHub {
15− owner = "home-assistant";
10+ owner = "OpenZWave";
1611 repo = "open-zwave";
17− rev = "2cd2137025c529835e4893a7b87c3d56605b2681";
18− sha256 = "04g8fb4f4ihakvvsmzcnncgfdd2ikmki7s22i9c6layzdwavbwf1";
12+ rev = "v${version}";
13+ sha256 = "0xgs4mmr0480c269wx9xkk67ikjzxkh8xcssrdx0f5xcl1lyd333";
1914 };
2015
16+ patches = [
17+ (fetchpatch {
18+ name = "fix-strncat-build-failure.patch";
19+ url = "https://github.com/OpenZWave/open-zwave/commit/601e5fb16232a7984885e67fdddaf5b9c9dd8105.patch";
20+ sha256 = "1n1k5arwk1dyc12xz6xl4n8yw28vghzhv27j65z1nca4zqsxgza1";
21+ })
22+ (fetchpatch {
23+ name = "fix-text-uninitialized.patch";
24+ url = "https://github.com/OpenZWave/open-zwave/commit/3b029a467e83bc7f0054e4dbba1e77e6eac7bc7f.patch";
25+ sha256 = "183mrzjh1zx2b2wzkj4jisiw8br7g7bbs167afls4li0fm01d638";
26+ })
27+ ];
28+
29+ outputs = [ "out" "doc" ];
30+
2131 nativeBuildInputs = [ doxygen fontconfig graphviz-nox libxml2 pkg-config which ];
2232
2333 buildInputs = [ systemd ];
@@ -26,13 +36,9 @@ in stdenv.mkDerivation {
2636
2737 enableParallelBuilding = true;
2838
29− installPhase = ''
30− runHook preInstall
31−
32− DESTDIR=$out PREFIX= pkgconfigdir=lib/pkgconfig make install $installFlags
33−
34− runHook postInstall
35− '';
39+ makeFlags = [
40+ "PREFIX=${placeholder "out"}"
41+ ];
3642
3743 FONTCONFIG_FILE="${fontconfig.out}/etc/fonts/fonts.conf";
3844 FONTCONFIG_PATH="${fontconfig.out}/etc/fonts/";
@@ -42,15 +48,6 @@ in stdenv.mkDerivation {
4248 --replace /etc/openzwave $out/etc/openzwave
4349 '';
4450
45− fixupPhase = ''
46− substituteInPlace $out/lib/pkgconfig/libopenzwave.pc \
47− --replace prefix= prefix=$out \
48− --replace dir= dir=$out
49−
50− substituteInPlace $out/bin/ozw_config \
51− --replace pcfile=${pkg-config} pcfile=$out
52− '';
53−
5451 meta = with lib; {
5552 description = "C++ library to control Z-Wave Networks via a USB Z-Wave Controller";
5653 homepage = "http://www.openzwave.net/";
pkgs/development/python-modules/homeassistant-pyozw/default.nix+15−2
@@ -1,6 +1,19 @@
1−{ python_openzwave, fetchPypi }:
1+{ python_openzwave, fetchPypi, openzwave, fetchFromGitHub }:
22
3−python_openzwave.overridePythonAttrs (oldAttrs: rec {
3+(python_openzwave.override {
4+ openzwave = openzwave.overrideAttrs (oldAttrs: {
5+ version = "unstable-2020-03-24";
6+
7+ src = fetchFromGitHub {
8+ owner = "home-assistant";
9+ repo = "open-zwave";
10+ rev = "94267fa298c1882f0dc73c0fd08f1f755ba83e83";
11+ sha256 = "0p2869fwidz1wcqzfm52cwm9ab96pmwkna3d4yvvh21nh09cvmwk";
12+ };
13+
14+ patches = [ ];
15+ });
16+}).overridePythonAttrs (oldAttrs: rec {
417 pname = "homeassistant_pyozw";
518 version = "0.1.10";
619