diff --git a/pkgs/games/klavaro/default.nix b/pkgs/games/klavaro/default.nix index e62c5a182339..557f75580ca9 100644 --- a/pkgs/games/klavaro/default.nix +++ b/pkgs/games/klavaro/default.nix @@ -1,12 +1,20 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig, intltool, curl, gtk3 }: +{ stdenv +, fetchurl +, makeWrapper +, curl +, file +, gtk3 +, intltool +, pkgconfig +}: stdenv.mkDerivation rec { pname = "klavaro"; - version = "3.08"; + version = "3.10"; src = fetchurl { url = "mirror://sourceforge/klavaro/${pname}-${version}.tar.bz2"; - sha256 = "0qmvr6d8wshwp0xvk5wbig4vlzxzcxrakhyhd32v8v3s18nhqsrc"; + sha256 = "0jnzdrndiq6m0bwgid977z5ghp4q61clwdlzfpx4fd2ml5x3iq95"; }; nativeBuildInputs = [ intltool makeWrapper pkgconfig ]; @@ -17,14 +25,20 @@ stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : $out/lib ''; + # Fixes /usr/bin/file: No such file or directory + preConfigure = '' + substituteInPlace configure \ + --replace "/usr/bin/file" "${file}/bin/file" + ''; + # Hack to avoid TMPDIR in RPATHs. preFixup = ''rm -rf "$(pwd)" ''; - meta = { - description = "Just another free touch typing tutor program"; + meta = with stdenv.lib; { + description = "Free touch typing tutor program"; homepage = "http://klavaro.sourceforge.net/"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = [stdenv.lib.maintainers.mimame]; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ mimame davidak ]; }; }