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

epdfview: fix building with cups 2.0

Browse Source
This commit is contained in:
Nikolay Amiantov 2014-11-14 16:30:38 +03:00
parent f7ba33de56
commit 237bf5443f
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/applications/misc/epdfview/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gtk, poppler }: { stdenv, fetchurl, fetchpatch, pkgconfig, gtk, poppler }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "epdfview-0.1.8"; name = "epdfview-0.1.8";
src = fetchurl { src = fetchurl {
@ -6,7 +6,17 @@ stdenv.mkDerivation rec {
sha256 = "1w7qybh8ssl4dffi5qfajq8mndw7ipsd92vkim03nywxgjp4i1ll"; sha256 = "1w7qybh8ssl4dffi5qfajq8mndw7ipsd92vkim03nywxgjp4i1ll";
}; };
buildInputs = [ pkgconfig gtk poppler ]; buildInputs = [ pkgconfig gtk poppler ];
patches = [ ./glib-top-level-header.patch ]; patches = [ (fetchpatch {
name = "epdfview-0.1.8-glib2-headers.patch";
url = "https://projects.archlinux.org/svntogit/community.git/plain/trunk/epdfview-0.1.8-glib2-headers.patch?h=packages/epdfview&id=40ba115c860bdec31d03a30fa594a7ec2864d634";
sha256 = "13ha8l3ysw065wr1gpi33dr3r23pv2w51iczzkx6pnxsqk9cda4f";
})
(fetchpatch {
name = "epdfview-0.1.8-modern-cups.patch";
url = "https://projects.archlinux.org/svntogit/community.git/plain/trunk/epdfview-0.1.8-modern-cups.patch?h=packages/epdfview&id=40ba115c860bdec31d03a30fa594a7ec2864d634";
sha256 = "15pjriq0ppnjgmr26r9zj9smv301w8szwps6n87sshm0yiw9sli7";
})
];
meta = { meta = {
homepage = http://trac.emma-soft.com/epdfview/; homepage = http://trac.emma-soft.com/epdfview/;
description = "A lightweight PDF document viewer using Poppler and GTK+"; description = "A lightweight PDF document viewer using Poppler and GTK+";

12
pkgs/applications/misc/epdfview/glib-top-level-header.patch
View File

@ -1,12 +0,0 @@
diff -Naur epdfview-0.1.8-orig/src/gtk/StockIcons.h epdfview-0.1.8/src/gtk/StockIcons.h
--- epdfview-0.1.8-orig/src/gtk/StockIcons.h 2011-05-28 06:24:57.000000000 -0400
+++ epdfview-0.1.8/src/gtk/StockIcons.h 2012-07-15 11:02:43.946339253 -0400
@@ -18,7 +18,7 @@
#if !defined (__STOCK_ICONS_H__)
#define __STOCK_ICONS_H__
-#include <glib/gmacros.h>
+#include <glib.h>
G_BEGIN_DECLS