diff options
| author | Robin Gloster <mail@glob.in> | 2017-01-22 20:25:16 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-01-25 20:12:41 +0100 |
| commit | dc52135d550c0f860bd5983d80d31f2e8fdc6424 (patch) | |
| tree | 9dfdb021388f9dbf70e7f7847544f3d86e44630a /pkgs/applications/misc/apvlv | |
| parent | 6bc1f2f61c113f49ae4c8799eff7e1b5d61adef1 (diff) | |
| download | nixpkgs-dc52135d550c0f860bd5983d80d31f2e8fdc6424.tar nixpkgs-dc52135d550c0f860bd5983d80d31f2e8fdc6424.tar.gz nixpkgs-dc52135d550c0f860bd5983d80d31f2e8fdc6424.tar.bz2 nixpkgs-dc52135d550c0f860bd5983d80d31f2e8fdc6424.tar.lz nixpkgs-dc52135d550c0f860bd5983d80d31f2e8fdc6424.tar.xz nixpkgs-dc52135d550c0f860bd5983d80d31f2e8fdc6424.tar.zst nixpkgs-dc52135d550c0f860bd5983d80d31f2e8fdc6424.zip | |
apvlv: 0.1 -> 0.1.5
Diffstat (limited to 'pkgs/applications/misc/apvlv')
| -rw-r--r-- | pkgs/applications/misc/apvlv/default.nix | 37 |
1 files changed, 24 insertions, 13 deletions
diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix index 88e08b40914..977f5e94e5d 100644 --- a/pkgs/applications/misc/apvlv/default.nix +++ b/pkgs/applications/misc/apvlv/default.nix @@ -1,26 +1,37 @@ -{ stdenv, fetchurl, cmake, pkgconfig, - gtk2 , poppler, freetype, libpthreadstubs, libXdmcp, libxshmfence +{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig, pcre, libxkbcommon, epoxy +, gtk3, poppler, freetype, libpthreadstubs, libXdmcp, libxshmfence }: stdenv.mkDerivation rec { - version = "0.1.f7f7b9c"; + version = "0.1.5"; name = "apvlv-${version}"; - src = fetchurl { - url = "https://github.com/downloads/naihe2010/apvlv/${name}-Source.tar.gz"; - sha256 = "125nlcfjdhgzi9jjxh9l2yc9g39l6jahf8qh2555q20xkxf4rl0w"; + src = fetchFromGitHub { + owner = "naihe2010"; + repo = "apvlv"; + rev = "v${version}"; + sha256 = "1n4xiic8lqnv3mqi7wpdv866gyyakax71gffv3n9427rmcld465i"; }; - preConfigure = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${poppler.dev}/include/poppler" - ''; + NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler"; buildInputs = [ pkgconfig cmake - poppler - freetype gtk2 - libpthreadstubs libXdmcp libxshmfence # otherwise warnings in compilation - ]; + poppler pcre libxkbcommon epoxy + freetype gtk3 + libpthreadstubs libXdmcp libxshmfence # otherwise warnings in compilation + ]; + + patches = [ + (fetchpatch { + url = "https://github.com/naihe2010/apvlv/commit/d432635b9c5ea6c052a2ae1fb71aedec5c4ad57a.patch"; + sha256 = "1am8dgv2kkpqmm2vaysa61czx8ppdx94zb3c59sx88np50jpy70w"; + }) + (fetchpatch { + url = "https://github.com/naihe2010/apvlv/commit/4c7a583e8431964def482e5471f02e6de8e62a7b.patch"; + sha256 = "1dszm120lwm90hcg5zmd4vr6pjyaxc84qmb7k0fr59mmb3qif62j"; + }) + ]; installPhase = '' # binary |