diff options
Diffstat (limited to 'pkgs/tools/graphics')
-rw-r--r-- | pkgs/tools/graphics/bins/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/graphics/editres/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/graphics/exif/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/graphics/glmark2/default.nix | 20 | ||||
-rw-r--r-- | pkgs/tools/graphics/icoutils/default.nix | 19 | ||||
-rw-r--r-- | pkgs/tools/graphics/pngcheck/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/graphics/scanbd/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/graphics/sng/default.nix | 4 |
8 files changed, 37 insertions, 22 deletions
diff --git a/pkgs/tools/graphics/bins/default.nix b/pkgs/tools/graphics/bins/default.nix index 579ec802e092..63bf9aae5521 100644 --- a/pkgs/tools/graphics/bins/default.nix +++ b/pkgs/tools/graphics/bins/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { ''; meta = { - description = "generates static HTML photo albums"; + description = "Generates static HTML photo albums"; homepage = http://bins.sautret.org; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/tools/graphics/editres/default.nix b/pkgs/tools/graphics/editres/default.nix index eb86acfc6242..a3d343cea577 100644 --- a/pkgs/tools/graphics/editres/default.nix +++ b/pkgs/tools/graphics/editres/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://cgit.freedesktop.org/xorg/app/editres/"; - description = "a dynamic resource editor for X Toolkit applications"; + description = "A dynamic resource editor for X Toolkit applications"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/graphics/exif/default.nix b/pkgs/tools/graphics/exif/default.nix index a8599980d94d..dd749c05e4a8 100644 --- a/pkgs/tools/graphics/exif/default.nix +++ b/pkgs/tools/graphics/exif/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libexif, popt }: +{ stdenv, fetchurl, pkgconfig, libexif, popt, libintlOrEmpty }: stdenv.mkDerivation rec { name = "exif-0.6.21"; @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1zb9hwdl783d4vd2s2rw642hg8hd6n0mfp6lrbiqmp9jmhlq5rsr"; }; - buildInputs = [ pkgconfig libexif popt ]; - + buildInputs = [ pkgconfig libexif popt ] ++ libintlOrEmpty; + meta = { homepage = http://libexif.sourceforge.net/; description = "A utility to read and manipulate EXIF data in digital photographs"; diff --git a/pkgs/tools/graphics/glmark2/default.nix b/pkgs/tools/graphics/glmark2/default.nix index 12ae9b6d89bd..b794d7ffbef2 100644 --- a/pkgs/tools/graphics/glmark2/default.nix +++ b/pkgs/tools/graphics/glmark2/default.nix @@ -1,19 +1,22 @@ -{ stdenv, fetchurl, pkgconfig, libjpeg, libpng12, xorg, libX11, mesa, libdrm, python27 }: +{ stdenv, fetchFromGitHub, pkgconfig, libjpeg, libpng, xorg, libX11, mesa, libdrm, python27, wayland }: + stdenv.mkDerivation rec { name = "glmark2-${version}"; - version = "2014.03"; + version = "2015-06-11"; - src = fetchurl { - url = "https://launchpad.net/glmark2/trunk/${version}/+download/${name}.tar.gz"; - sha256 = "1dgn7ln115ivk13d1yagpj06lgllpv2jrr41kcnhdkhqz6m43vdx"; + src = fetchFromGitHub { + owner = "glmark2"; + repo = "glmark2"; + rev = "fa71af2dfab711fac87b9504b6fc9862f44bf72a"; + sha256 = "1razwrmwk94wf8y7rnqpas9520gidixzcwa65pg946n823105znw"; }; buildInputs = [ - pkgconfig libjpeg libpng12 xorg.libxcb libX11 mesa libdrm python27 + pkgconfig libjpeg libpng xorg.libxcb libX11 mesa libdrm python27 wayland ]; buildPhase = '' - python ./waf configure --prefix=$out --with-flavors x11-gl,x11-glesv2 + python ./waf configure --prefix=$out --with-flavors x11-gl,x11-glesv2,drm-gl,drm-glesv2,wayland-gl,wayland-glesv2 python2 ./waf ''; @@ -23,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "OpenGL (ES) 2.0 benchmark"; - homepage = https://launchpad.net/glmark2; + homepage = https://github.com/glmark2/glmark2; license = licenses.gpl3Plus; longDescription = '' glmark2 is a benchmark for OpenGL (ES) 2.0. It uses only the subset of @@ -33,4 +36,3 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.wmertens ]; }; } - diff --git a/pkgs/tools/graphics/icoutils/default.nix b/pkgs/tools/graphics/icoutils/default.nix index 94a613078a47..300e05023b1b 100644 --- a/pkgs/tools/graphics/icoutils/default.nix +++ b/pkgs/tools/graphics/icoutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libpng }: +{ stdenv, fetchurl, libpng, perl, perlPackages, makeWrapper }: stdenv.mkDerivation rec { name = "icoutils-0.31.0"; @@ -8,11 +8,24 @@ stdenv.mkDerivation rec { sha256 = "0wdgyfb1clrn3maq84vi4vkwjydy72p5hzk6kb9nb3a19bbxk5d8"; }; - buildInputs = [ libpng ]; + buildInputs = [ makeWrapper libpng perl ]; + propagatedBuildInputs = [ perlPackages.LWP ]; + + patchPhase = '' + patchShebangs extresso/extresso + patchShebangs extresso/extresso.in + patchShebangs extresso/genresscript + patchShebangs extresso/genresscript.in + ''; + + preFixup = '' + wrapProgram $out/bin/extresso --prefix PERL5LIB : $PERL5LIB + wrapProgram $out/bin/genresscript --prefix PERL5LIB : $PERL5LIB + ''; meta = { homepage = http://www.nongnu.org/icoutils/; - description = "Set of programs to deal with Microsoft Windows(R) icon and cursor files"; + description = "Set of programs to deal with Microsoft Windows(R) icon and cursor files"; license = stdenv.lib.licenses.gpl3Plus; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/graphics/pngcheck/default.nix b/pkgs/tools/graphics/pngcheck/default.nix index b8d020ca4343..6814a06e3b95 100644 --- a/pkgs/tools/graphics/pngcheck/default.nix +++ b/pkgs/tools/graphics/pngcheck/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; makefile = "Makefile.unx"; - makeFlags = "ZPATH=${zlib.out}/lib"; + makeFlags = "ZPATH=${zlib.static}/lib"; buildInputs = [ zlib ]; diff --git a/pkgs/tools/graphics/scanbd/default.nix b/pkgs/tools/graphics/scanbd/default.nix index b3fd986165a7..86b4cb91de07 100644 --- a/pkgs/tools/graphics/scanbd/default.nix +++ b/pkgs/tools/graphics/scanbd/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig -, dbus, libconfuse, sane-backends, systemd }: +, dbus, libconfuse, libjpeg, sane-backends, systemd }: stdenv.mkDerivation rec { name = "scanbd-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ dbus libconfuse sane-backends systemd ]; + buildInputs = [ dbus libconfuse libjpeg sane-backends systemd ]; configureFlags = [ "--disable-Werror" diff --git a/pkgs/tools/graphics/sng/default.nix b/pkgs/tools/graphics/sng/default.nix index d9b06c2adf35..098721d6b932 100644 --- a/pkgs/tools/graphics/sng/default.nix +++ b/pkgs/tools/graphics/sng/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sng-${version}"; - version = "1.0.6"; + version = "1.1.0"; src = fetchurl { url = "mirror://sourceforge/sng/sng-${version}.tar.gz"; - sha256 = "04ym62qh8blsqigm3kr1shj9pn62y373wdaavk74rzwjzlhwhmq6"; + sha256 = "06a6ydvx9xb3vxvrzdrg3hq0rjwwj9ibr7fyyxjxq6qx1j3mb70i"; }; buildInputs = [ libpng ]; |