uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
74
pkgs/applications/misc/apvlv/default.nix
Normal file
74
pkgs/applications/misc/apvlv/default.nix
Normal file
|
|
@ -0,0 +1,74 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, pcre, libxkbcommon, libepoxy
|
||||
, gtk3, poppler, freetype, libpthreadstubs, libXdmcp, libxshmfence, wrapGAppsHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.1.5";
|
||||
pname = "apvlv";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "naihe2010";
|
||||
repo = "apvlv";
|
||||
rev = "v${version}";
|
||||
sha256 = "1n4xiic8lqnv3mqi7wpdv866gyyakax71gffv3n9427rmcld465i";
|
||||
};
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
poppler pcre libxkbcommon libepoxy
|
||||
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";
|
||||
})
|
||||
# fix build with gcc7
|
||||
(fetchpatch {
|
||||
url = "https://github.com/naihe2010/apvlv/commit/a3a895772a27d76dab0c37643f0f4c73f9970e62.patch";
|
||||
sha256 = "1fpc7wr1ajilvwi5gjsy5g9jcx4bl03gp5dmajg90ljqbhwz2bfi";
|
||||
})
|
||||
./fix-build-with-poppler-0.73.0.patch
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
# binary
|
||||
mkdir -p $out/bin
|
||||
cp src/apvlv $out/bin/apvlv
|
||||
|
||||
# displays pdfStartup.pdf as default pdf entry
|
||||
mkdir -p $out/share/doc/apvlv/
|
||||
cp ../Startup.pdf $out/share/doc/apvlv/Startup.pdf
|
||||
cp ../main_menubar.glade $out/share/doc/apvlv/main_menubar.glade
|
||||
''
|
||||
+ lib.optionalString (!stdenv.isDarwin) ''
|
||||
install -D ../apvlv.desktop $out/share/applications/apvlv.desktop
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://naihe2010.github.io/apvlv/";
|
||||
description = "PDF viewer with Vim-like behaviour";
|
||||
longDescription = ''
|
||||
apvlv is a PDF/DJVU/UMD/TXT Viewer Under Linux/WIN32
|
||||
with Vim-like behaviour.
|
||||
'';
|
||||
|
||||
license = licenses.lgpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.ardumont ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/src/ApvlvPdf.cc b/src/ApvlvPdf.cc
|
||||
index 765b112..83d133f 100644
|
||||
--- a/src/ApvlvPdf.cc
|
||||
+++ b/src/ApvlvPdf.cc
|
||||
@@ -29,7 +29,7 @@
|
||||
#include "ApvlvPdf.h"
|
||||
|
||||
#ifndef POPPLER_WITH_GDK
|
||||
-#include <goo/gtypes.h>
|
||||
+#include <goo/gfile.h>
|
||||
|
||||
static void
|
||||
copy_cairo_surface_to_pixbuf (cairo_surface_t *surface,
|
||||
Loading…
Add table
Add a link
Reference in a new issue