diff options
| author | Domen Kožar <domen@dev.si> | 2016-03-27 13:19:04 +0100 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2016-03-27 13:19:04 +0100 |
| commit | b07e7bfc7bc8f0b5428acaab026738866af32a28 (patch) | |
| tree | 88dfca9473373d72d3d0e60a84ced34f33d69bf4 /pkgs/applications/misc | |
| parent | d88ae1045d37f8cd1b3428617670f7358eb45a29 (diff) | |
| parent | dae3a7b721aeaaffabf336563182852c800a5ae0 (diff) | |
| download | nixpkgs-b07e7bfc7bc8f0b5428acaab026738866af32a28.tar nixpkgs-b07e7bfc7bc8f0b5428acaab026738866af32a28.tar.gz nixpkgs-b07e7bfc7bc8f0b5428acaab026738866af32a28.tar.bz2 nixpkgs-b07e7bfc7bc8f0b5428acaab026738866af32a28.tar.lz nixpkgs-b07e7bfc7bc8f0b5428acaab026738866af32a28.tar.xz nixpkgs-b07e7bfc7bc8f0b5428acaab026738866af32a28.tar.zst nixpkgs-b07e7bfc7bc8f0b5428acaab026738866af32a28.zip | |
Merge remote-tracking branch 'origin/staging'
Diffstat (limited to 'pkgs/applications/misc')
| -rw-r--r-- | pkgs/applications/misc/abook/default.nix | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/pkgs/applications/misc/abook/default.nix b/pkgs/applications/misc/abook/default.nix index 77e48e49dd8..2c4bc0f2128 100644 --- a/pkgs/applications/misc/abook/default.nix +++ b/pkgs/applications/misc/abook/default.nix @@ -1,15 +1,23 @@ -{ stdenv, fetchurl, pkgconfig, ncurses, readline }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, ncurses, readline }: -let version = "0.6.0pre2"; in stdenv.mkDerivation rec { - name = "abook-${version}"; + name = "abook-0.6.0pre2"; src = fetchurl { url = "http://abook.sourceforge.net/devel/${name}.tar.gz"; - sha256 = "59d444504109dd96816e003b3023175981ae179af479349c34fa70bc12f6d385"; + sha256 = "11fkyq9bqw7s6jf38yglk8bsx0ar2wik0fq0ds0rdp8985849m2r"; }; - buildInputs = [ pkgconfig ncurses readline ]; + patches = [ + (fetchpatch { + url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/gcc5.patch?h=packages/abook"; + name = "gcc5.patch"; + sha256 = "13n3qd6yy45i5n8ppjn9hj6y63ymjrq96280683xk7f7rjavw5nn"; + }) + ]; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ncurses readline ]; meta = { homepage = "http://abook.sourceforge.net/"; |