From 54f77325e7ce7d86157e08c084c15cb68e7823c4 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Sun, 13 Jun 2021 17:17:05 +0200 Subject: [PATCH 1/3] imv: install .desktop file --- pkgs/applications/graphics/imv/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/graphics/imv/default.nix b/pkgs/applications/graphics/imv/default.nix index 3f6a27cbc76a..41fd114fdb5f 100644 --- a/pkgs/applications/graphics/imv/default.nix +++ b/pkgs/applications/graphics/imv/default.nix @@ -90,6 +90,12 @@ stdenv.mkDerivation rec { ] ++ windowSystems."${withWindowSystem}" ++ builtins.map (b: backends."${b}") withBackends; + postInstall = '' + # fix the executable path and install the desktop item + substituteInPlace ../files/imv.desktop --replace "imv %F" "$out/bin/imv %F" + install -Dm644 ../files/imv.desktop $out/share/applications/ + ''; + postFixup = lib.optionalString (withWindowSystem == "all") '' # The `bin/imv` script assumes imv-wayland or imv-x11 in PATH, # so we have to fix those to the binaries we installed into the /nix/store From 2732a344bbad05bd8245561760c44b688869b487 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Mon, 14 Jun 2021 00:25:59 +0200 Subject: [PATCH 2/3] imv: remove unused fontconfig argument --- pkgs/applications/graphics/imv/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/graphics/imv/default.nix b/pkgs/applications/graphics/imv/default.nix index 41fd114fdb5f..298226ed0afd 100644 --- a/pkgs/applications/graphics/imv/default.nix +++ b/pkgs/applications/graphics/imv/default.nix @@ -5,7 +5,6 @@ , cmocka , docbook_xsl , libxslt -, fontconfig , meson , ninja , pkg-config From 945c021476da4f8bf0a1845d5c5bee9f9f4d1451 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Mon, 14 Jun 2021 00:27:20 +0200 Subject: [PATCH 3/3] imv: clarify license licenses.gpl2 is deprecated, either gpl2Only or gpl2Plus should be specified. However, imv is dual-licensed under the GPL and MIT licenses. MIT is the one in the root LICENSE file, it's the one that Github shows in the main repo page and is also the more permissive one, therefore I changed it to licenses.mit. --- 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 298226ed0afd..e9488b845f22 100644 --- a/pkgs/applications/graphics/imv/default.nix +++ b/pkgs/applications/graphics/imv/default.nix @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A command line image viewer for tiling window managers"; homepage = "https://github.com/eXeC64/imv"; - license = licenses.gpl2; + license = licenses.mit; maintainers = with maintainers; [ rnhmjoj markus1189 ]; platforms = platforms.all; };