diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/by-name/sx/sxiv/package.nix similarity index 82% rename from pkgs/applications/graphics/sxiv/default.nix rename to pkgs/by-name/sx/sxiv/package.nix index 20b813d59904..38ee448bdfa7 100644 --- a/pkgs/applications/graphics/sxiv/default.nix +++ b/pkgs/by-name/sx/sxiv/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, libxft, - imlib2, + imlib2Full, giflib, libexif, conf ? null, @@ -13,11 +13,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "sxiv"; version = "26"; + strictDeps = true; + __structuredAttrs = true; + src = fetchFromGitHub { owner = "muennich"; repo = "sxiv"; - rev = "v${finalAttrs.version}"; - sha256 = "0xaawlfdy7b277m38mgg4423kd7p1ffn0dq4hciqs6ivbb3q9c4f"; + tag = "v${finalAttrs.version}"; + hash = "sha256-jrCEx1o7Go0jgwQ3YJ0L97Q5BCHvVTTqOWId3xzlSnU="; }; configFile = lib.optionalString (conf != null) (builtins.toFile "config.def.h" conf); @@ -25,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libxft - imlib2 + imlib2Full giflib libexif ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7ff153d3cf05..c4ecea237155 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10089,10 +10089,6 @@ with pkgs; }) ); - sxiv = callPackage ../applications/graphics/sxiv { - imlib2 = imlib2Full; - }; - dropbox = callPackage ../applications/networking/dropbox { }; dropbox-cli = callPackage ../applications/networking/dropbox/cli.nix { };