diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2014-11-14 16:30:38 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2014-11-14 16:30:38 +0300 |
| commit | 237bf5443fba2f5565a4486f7cbc3145ea5b3bb7 (patch) | |
| tree | a044f0d702635d155e5616d9bedcc6309175691e /pkgs/applications/misc/epdfview | |
| parent | f7ba33de561aac0beccd0eebb7a3a8499aab46eb (diff) | |
| download | nixlib-237bf5443fba2f5565a4486f7cbc3145ea5b3bb7.tar nixlib-237bf5443fba2f5565a4486f7cbc3145ea5b3bb7.tar.gz nixlib-237bf5443fba2f5565a4486f7cbc3145ea5b3bb7.tar.bz2 nixlib-237bf5443fba2f5565a4486f7cbc3145ea5b3bb7.tar.lz nixlib-237bf5443fba2f5565a4486f7cbc3145ea5b3bb7.tar.xz nixlib-237bf5443fba2f5565a4486f7cbc3145ea5b3bb7.tar.zst nixlib-237bf5443fba2f5565a4486f7cbc3145ea5b3bb7.zip | |
epdfview: fix building with cups 2.0
Diffstat (limited to 'pkgs/applications/misc/epdfview')
| -rw-r--r-- | pkgs/applications/misc/epdfview/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/applications/misc/epdfview/glib-top-level-header.patch | 12 |
2 files changed, 12 insertions, 14 deletions
diff --git a/pkgs/applications/misc/epdfview/default.nix b/pkgs/applications/misc/epdfview/default.nix index d79162289c3c..7eaec5a8ede0 100644 --- a/pkgs/applications/misc/epdfview/default.nix +++ b/pkgs/applications/misc/epdfview/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, poppler }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk, poppler }: stdenv.mkDerivation rec { name = "epdfview-0.1.8"; src = fetchurl { @@ -6,7 +6,17 @@ stdenv.mkDerivation rec { sha256 = "1w7qybh8ssl4dffi5qfajq8mndw7ipsd92vkim03nywxgjp4i1ll"; }; 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 = { homepage = http://trac.emma-soft.com/epdfview/; description = "A lightweight PDF document viewer using Poppler and GTK+"; diff --git a/pkgs/applications/misc/epdfview/glib-top-level-header.patch b/pkgs/applications/misc/epdfview/glib-top-level-header.patch deleted file mode 100644 index a321ad3a2b67..000000000000 --- a/pkgs/applications/misc/epdfview/glib-top-level-header.patch +++ /dev/null @@ -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 - |