@@ -1,27 +1,30 @@
1−{ stdenv, lib, fetchurl, python, zip, fop }:
1+{ stdenv, lib, fetchFromGitHub, python3, pandoc }:
22
33stdenv.mkDerivation {
44 pname = "bgnet";
5− version = "3.0.21";
5+ # to be found in the Makefile
6+ version = "3.1.2";
67
7− src = fetchurl {
8− url = "https://beej.us/guide/bgnet/bgnet.tgz";
9− sha256 = "00ggr5prc5i3w9gaaw2sadfq6haq7lmh0vdilaxx8xz9z5znxvyv";
8+ src = fetchFromGitHub {
9+ owner = "beejjorgensen";
10+ repo = "bgnet";
11+ rev = "782a785a35d43c355951b8151628d7c64e4d0346";
12+ sha256 = "19w0r3zr71ydd29amqwn8q3npgrpy5kkshyshyji2hw5hky6iy92";
1013 };
1114
12− buildInputs = [ python zip fop ];
13−
14− preBuild = ''
15− sed -i "s/#disable=1/disable=1/" bin/bgvalidate
15+ buildPhase = ''
1616 # build scripts need some love
17− patchShebangs .
17+ patchShebangs bin/preproc
18+
19+ make -C src bgnet.html
1820 '';
1921
2022 installPhase = ''
21− mkdir -p $out
22− mv * $out/
23+ install -Dm644 src/bgnet.html $out/share/doc/bgnet/html/index.html
2324 '';
2425
26+ nativeBuildInputs = [ python3 pandoc ];
27+
2528 meta = {
2629 description = "Beej’s Guide to Network Programming";
2730 homepage = "https://beej.us/guide/bgnet/";