public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

apvlv: 0.1 -> 0.1.5

This commit is contained in:
Robin Gloster 2017-01-22 20:25:16 +01:00
parent 6bc1f2f61c
commit dc52135d55
No known key found for this signature in database
GPG Key ID: 5E4C836C632C2882
2 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
pkgs/applications/misc/apvlv/default.nix
View File

@ -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

4
pkgs/top-level/all-packages.nix
View File

@ -15731,9 +15731,7 @@ in
inherit (gnome2) libgnomeprint libgnomeprintui libgnomecanvas;
};
apvlv = callPackage ../applications/misc/apvlv {
gtk2 = gtk2-x11;
};
apvlv = callPackage ../applications/misc/apvlv { };
xpdf = callPackage ../applications/misc/xpdf {
base14Fonts = "${ghostscript}/share/ghostscript/fonts";