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

zathura-ps: 0.2.3 -> 0.2.5

This commit is contained in:
Miguel Madrid Mencía 2017-12-31 02:05:11 +01:00
parent 8b67faf236
commit f0c992bf51
No known key found for this signature in database
GPG Key ID: 4D0F6894D41C6957
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/misc/zathura/ps/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, lib, fetchurl, pkgconfig, gtk, zathura_core, girara, libspectre, gettext }: { stdenv, lib, fetchurl, pkgconfig, gtk, zathura_core, girara, libspectre, gettext }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "zathura-ps-0.2.3"; name = "zathura-ps-0.2.5";
src = fetchurl { src = fetchurl {
url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz"; url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz";
sha256 = "18wsfy8pqficdgj8wy2aws7j4fy8z78157rhqk17mj5f295zgvm9"; sha256 = "1x4knqja8pw2a5cb3y2209nr3iddj1z8nwasy48v5nprj61fdxqj";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

28
pkgs/applications/misc/zathura/ps/gtkflags.patch
View File

@ -1,9 +1,7 @@
diff --git a/config.mk b/config.mk.new --- zathura-ps-0.2.5.orig/config.mk 2017-12-21 14:21:17.000000000 +0100
index c3a7b37..0cbce67 100644 +++ zathura-ps-0.2.5/config.mk 2017-12-31 01:05:17.507268817 +0100
--- a/config.mk @@ -16,6 +16,9 @@
+++ b/config.mk DESKTOPPREFIX ?= ${PREFIX}/share/applications
@@ -10,6 +10,9 @@ ZATHURA_VERSION_CHECK ?= $(shell pkg-config --atleast-version=$(ZATHURA_MIN_VERS
PREFIX ?= /usr
# libs # libs
+GTK_INC ?= $(shell pkg-config --cflags gtk+-2.0) +GTK_INC ?= $(shell pkg-config --cflags gtk+-2.0)
@ -12,14 +10,14 @@ index c3a7b37..0cbce67 100644
CAIRO_INC ?= $(shell pkg-config --cflags cairo) CAIRO_INC ?= $(shell pkg-config --cflags cairo)
CAIRO_LIB ?= $(shell pkg-config --libs cairo) CAIRO_LIB ?= $(shell pkg-config --libs cairo)
@@ -26,8 +29,8 @@ ZATHURA_INC ?= $(shell pkg-config --cflags zathura) @@ -34,8 +37,8 @@
PLUGINDIR ?= $(shell pkg-config --variable=plugindir zathura) PLUGINDIR = ${LIBDIR}/zathura
PLUGINDIR ?= ${PREFIX}/lib/zathura endif
-INCS = ${GLIB_INC} ${SPECTRE_INC} ${GIRARA_INC} ${ZATHURA_INC} -INCS = ${GLIB_INC} ${SPECTRE_INC} ${GIRARA_INC} ${CAIRO_INC} ${ZATHURA_INC}
-LIBS = ${GLIB_LIB} ${SPECTRE_LIB} ${GIRARA_LIB} -LIBS = ${GLIB_LIB} ${SPECTRE_LIB} ${GIRARA_LIB} ${CAIRO_LIB}
+INCS = ${GLIB_INC} ${SPECTRE_INC} ${GIRARA_INC} ${ZATHURA_INC} ${GTK_INC} +INCS = ${GLIB_INC} ${SPECTRE_INC} ${GIRARA_INC} ${CAIRO_INC} ${ZATHURA_INC} ${GTK_INC}
+LIBS = ${GLIB_LIB} ${SPECTRE_LIB} ${GIRARA_LIB} ${GTK_LIB} +LIBS = ${GLIB_LIB} ${SPECTRE_LIB} ${GIRARA_LIB} ${CAIRO_LIB } ${GTK_LIB}
# flags # compiler flags
CFLAGS += -std=c99 -fPIC -pedantic -Wall -Wno-format-zero-length $(INCS) CFLAGS += -std=c11 -fPIC -pedantic -Wall -Wno-format-zero-length $(INCS)