From 7a58a44474d48f4e55a053134d9d4bfe8757cc97 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Mon, 3 Sep 2018 14:22:32 +0200 Subject: [PATCH 1/2] imv: 2.1.3 -> 3.0.0 --- pkgs/applications/graphics/imv/default.nix | 23 ++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/graphics/imv/default.nix b/pkgs/applications/graphics/imv/default.nix index e9a0dccd30a9..f02184d98527 100644 --- a/pkgs/applications/graphics/imv/default.nix +++ b/pkgs/applications/graphics/imv/default.nix @@ -1,18 +1,25 @@ -{ stdenv, fetchgit, SDL2, SDL2_ttf, freeimage, fontconfig }: +{ stdenv, fetchFromGitHub, SDL2, SDL2_ttf +, freeimage, fontconfig, pkgconfig +, asciidoc, docbook_xsl, libxslt, cmocka +}: stdenv.mkDerivation rec { name = "imv-${version}"; - version = "2.1.3"; + version = "3.0.0"; - src = fetchgit { - url = "https://github.com/eXeC64/imv.git"; - rev = "e59d0e9e120f1dbde9ab068748a190e93978e5b7"; - sha256 = "0j48dk1bcbh5541522qkn487637wcx104zckrnxa5g3nirfqa7r7"; + src = fetchFromGitHub { + owner = "eXeC64"; + repo = "imv"; + rev = "v${version}"; + sha256 = "0j5aykdkm1g518ism5y5flhwxvjvl92ksq989fhl2wpnv0la82jp"; }; - buildInputs = [ SDL2 SDL2_ttf freeimage fontconfig ]; + buildInputs = [ + SDL2 SDL2_ttf freeimage fontconfig pkgconfig + asciidoc docbook_xsl libxslt cmocka + ]; - configurePhase = "substituteInPlace Makefile --replace /usr $out"; + installFlags = [ "PREFIX=$(out)" "CONFIGPREFIX=$(out)/etc" ]; meta = with stdenv.lib; { description = "A command line image viewer for tiling window managers"; From d5b0c4d5c2fb59316ee85125e9df49cb30b85b74 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Tue, 4 Sep 2018 00:35:17 +0200 Subject: [PATCH 2/2] imv: build only on x86_64 linux --- pkgs/applications/graphics/imv/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/imv/default.nix b/pkgs/applications/graphics/imv/default.nix index f02184d98527..9def3f16ad03 100644 --- a/pkgs/applications/graphics/imv/default.nix +++ b/pkgs/applications/graphics/imv/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/eXeC64/imv; license = licenses.gpl2; maintainers = with maintainers; [ rnhmjoj ]; - platforms = platforms.unix; + platforms = [ "x86_64-linux" ]; }; }