Skip to content

Commit 671d2c5

Browse files
Merge pull request #268573 from panicgh/rrdtool
2 parents a965b28 + 07692e0 commit 671d2c5

File tree

1 file changed

+24
-7
lines changed

1 file changed

+24
-7
lines changed

pkgs/tools/misc/rrdtool/default.nix

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,33 @@
1-
{ fetchurl, lib, stdenv, gettext, perl, pkg-config, libxml2, pango, cairo, groff
2-
, tcl, darwin }:
1+
{ lib
2+
, stdenv
3+
, fetchFromGitHub
4+
, autoreconfHook
5+
, gettext
6+
, perl
7+
, pkg-config
8+
, libxml2
9+
, pango
10+
, cairo
11+
, groff
12+
, tcl
13+
, darwin
14+
}:
315

416
perl.pkgs.toPerlModule (stdenv.mkDerivation rec {
517
pname = "rrdtool";
6-
version = "1.7.2";
18+
version = "1.8.0";
719

8-
src = fetchurl {
9-
url = "https://oss.oetiker.ch/rrdtool/pub/rrdtool-${version}.tar.gz";
10-
sha256 = "1nsqra0g2nja19akmf9x5y9hhgc35ml3w9dcdz2ayz7zgvmzm6d1";
20+
src = fetchFromGitHub {
21+
owner = "oetiker";
22+
repo = "rrdtool-1.x";
23+
rev = "v${version}";
24+
hash = "sha256-a+AxU1+YpkGoFs1Iu/CHAEZ4XIkWs7Vsnr6RcfXzsBE=";
1125
};
1226

13-
nativeBuildInputs = [ pkg-config ];
27+
nativeBuildInputs = [
28+
pkg-config
29+
autoreconfHook
30+
];
1431

1532
buildInputs = [ gettext perl libxml2 pango cairo groff ]
1633
++ lib.optionals stdenv.isDarwin [ tcl darwin.apple_sdk.frameworks.ApplicationServices ];

0 commit comments

Comments
 (0)