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

zathura: 0.2.9 -> 0.3.1; girara: 0.2.2 -> 0.2.3

Browse Source
This commit is contained in:
me@vikramverma.com 2014-10-23 11:57:30 +00:00 committed by Rok Garbas
parent 2ac3c2e462
commit e6f7910551
6 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/misc/girara/default.nix
View File

@ -1,16 +1,19 @@
{ stdenv, fetchurl, pkgconfig, gtk, gettext }: { stdenv, fetchurl, pkgconfig, gtk, gettext, ncurses }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "girara-0.2.2"; name = "girara-0.2.3";
src = fetchurl { src = fetchurl {
url = "http://pwmt.org/projects/girara/download/${name}.tar.gz"; url = "http://pwmt.org/projects/girara/download/${name}.tar.gz";
sha256 = "0lv6wqhx2avdxj6yx111jfs4j32r0xzmmkhy7pgzxpf73kgxz0k3"; sha256 = "1phfmqp8y17zcy9yi6pm2f80x8ldbk60iswpm4bmjz5217jwqzxh";
}; };
buildInputs = [ pkgconfig gtk gettext ]; buildInputs = [ pkgconfig gtk gettext ];
makeFlags = "PREFIX=$(out)"; makeFlags = [
"PREFIX=$(out)"
"TPUT=${ncurses}/bin/tput"
];
meta = { meta = {
homepage = http://pwmt.org/projects/girara/; homepage = http://pwmt.org/projects/girara/;

13
pkgs/applications/misc/zathura/core/default.nix
View File

@ -1,17 +1,22 @@
{ stdenv, fetchurl, pkgconfig, gtk, girara, gettext, docutils, file, makeWrapper, zathura_icon }: { stdenv, fetchurl, pkgconfig, gtk, girara, ncurses, gettext, docutils, file, makeWrapper, zathura_icon }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.2.9"; version = "0.3.1";
name = "zathura-core-${version}"; name = "zathura-core-${version}";
src = fetchurl { src = fetchurl {
url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz"; url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz";
sha256 = "17z05skjk95115ajp6459k1djadza1w8kck7jn1qnd697r01s1rc"; sha256 = "1wwjj7vnzpkvn83674mapapvl2qsn7y44w17lq63283j1lic00mm";
}; };
buildInputs = [ pkgconfig file gtk girara gettext makeWrapper ]; buildInputs = [ pkgconfig file gtk girara gettext makeWrapper ];
makeFlags = [ "PREFIX=$(out)" "RSTTOMAN=${docutils}/bin/rst2man.py" "VERBOSE=1" ]; makeFlags = [
"PREFIX=$(out)"
"RSTTOMAN=${docutils}/bin/rst2man.py"
"VERBOSE=1"
"TPUT=${ncurses}/bin/tput"
];
postInstall = '' postInstall = ''
wrapProgram "$out/bin/zathura" \ wrapProgram "$out/bin/zathura" \

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

@ -1,7 +1,7 @@
{ callPackage, pkgs, fetchurl, useMupdf }: { callPackage, pkgs, fetchurl, stdenv, useMupdf }:
rec { rec {
inherit (pkgs) stdenv; inherit stdenv;
icon = ./icon.xpm; icon = ./icon.xpm;

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

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, gtk, zathura_core, girara, djvulibre, gettext }: { stdenv, fetchurl, pkgconfig, gtk, zathura_core, girara, djvulibre, gettext }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "zathura-djvu-0.2.3"; name = "zathura-djvu-0.2.4";
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 = "12gd8kb0al5mknh4rlvxzgzwz3vhjggqjh8ws27phaq14paq4vn1"; sha256 = "1g1lafmrjbx0xv7fljdmyqxx0k334sq4q6jy4a0q5xfrgz0bh45c";
}; };
buildInputs = [ pkgconfig djvulibre gettext zathura_core gtk girara ]; buildInputs = [ pkgconfig djvulibre gettext zathura_core gtk girara ];

4
pkgs/applications/misc/zathura/pdf-mupdf/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, zathura_core, gtk, girara, mupdf, openssl, openjpeg, libjpeg, jbig2dec }: { stdenv, fetchurl, pkgconfig, zathura_core, gtk, girara, mupdf, openssl, openjpeg, libjpeg, jbig2dec }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.2.6"; version = "0.2.7";
name = "zathura-pdf-mupdf-${version}"; name = "zathura-pdf-mupdf-${version}";
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 = "5df94b6f906008b5f3bca770a552da6d2917d6b8d3e4b3049cb7001302041b20"; sha256 = "0gr5kkk75hn7sz9kmzynhhcdd9xb9sz5gdb8p1iz9g0fjhskyd5i";
}; };
buildInputs = [ pkgconfig zathura_core gtk girara openssl mupdf openjpeg libjpeg jbig2dec ]; buildInputs = [ pkgconfig zathura_core gtk girara openssl mupdf openjpeg libjpeg jbig2dec ];

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

@ -10926,6 +10926,7 @@ let
(let callPackage = newScope pkgs.zathuraCollection; in (let callPackage = newScope pkgs.zathuraCollection; in
import ../applications/misc/zathura { import ../applications/misc/zathura {
inherit callPackage pkgs fetchurl; inherit callPackage pkgs fetchurl;
stdenv = overrideGCC stdenv gcc49;
useMupdf = config.zathura.useMupdf or false; useMupdf = config.zathura.useMupdf or false;
}); });
@ -10937,6 +10938,7 @@ let
girara = callPackage ../applications/misc/girara { girara = callPackage ../applications/misc/girara {
gtk = gtk3; gtk = gtk3;
stdenv = overrideGCC stdenv gcc49;
}; };
zgrviewer = callPackage ../applications/graphics/zgrviewer {}; zgrviewer = callPackage ../applications/graphics/zgrviewer {};