Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

abook: fix build with gcc5

(cherry picked from commit d4ae8b68cbc59915451b5b00f39ecac844494c68)

+13 -5
+13 -5
pkgs/applications/misc/abook/default.nix
··· 1 - { stdenv, fetchurl, pkgconfig, ncurses, readline }: 1 + { stdenv, fetchurl, fetchpatch, pkgconfig, ncurses, readline }: 2 2 3 - let version = "0.6.0pre2"; in 4 3 stdenv.mkDerivation rec { 5 - name = "abook-${version}"; 4 + name = "abook-0.6.0pre2"; 6 5 7 6 src = fetchurl { 8 7 url = "http://abook.sourceforge.net/devel/${name}.tar.gz"; 9 - sha256 = "59d444504109dd96816e003b3023175981ae179af479349c34fa70bc12f6d385"; 8 + sha256 = "11fkyq9bqw7s6jf38yglk8bsx0ar2wik0fq0ds0rdp8985849m2r"; 10 9 }; 11 10 12 - buildInputs = [ pkgconfig ncurses readline ]; 11 + patches = [ 12 + (fetchpatch { 13 + url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/gcc5.patch?h=packages/abook"; 14 + name = "gcc5.patch"; 15 + sha256 = "13n3qd6yy45i5n8ppjn9hj6y63ymjrq96280683xk7f7rjavw5nn"; 16 + }) 17 + ]; 18 + 19 + nativeBuildInputs = [ pkgconfig ]; 20 + buildInputs = [ ncurses readline ]; 13 21 14 22 meta = { 15 23 homepage = "http://abook.sourceforge.net/";