diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 65dfe19ecc43..f74a75c1d824 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5775,6 +5775,11 @@ githubId = 7047019; name = "Florent Becker"; }; + galen = { + github = "galenhuntington"; + githubId = 1851962; + name = "Galen Huntington"; + }; gamb = { email = "adam.gamble@pm.me"; github = "gamb"; diff --git a/pkgs/applications/graphics/xv/default.nix b/pkgs/applications/graphics/xv/default.nix new file mode 100644 index 000000000000..8b26c42b9cac --- /dev/null +++ b/pkgs/applications/graphics/xv/default.nix @@ -0,0 +1,38 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + xorg, + libpng, + libwebp, + libtiff, + libjpeg, + jasper, +}: + +stdenv.mkDerivation rec { + pname = "xv"; + version = "4.1.1"; + + src = fetchFromGitHub { + owner = "jasper-software"; + repo = "xv"; + rev = "v${version}"; + sha256 = "vwSUKWr4Hffx04ATUI58m7UOS/lVTnIVDC3ZTWRwJMM="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ xorg.libX11 xorg.libXt libpng libwebp libtiff jasper ]; + + meta = { + description = "Classic image viewer and editor for X."; + homepage = "http://www.trilon.com/xv/"; + license = { + fullName = "XV License"; + url = "https://github.com/jasper-software/xv/blob/main/src/README"; + free = false; + }; + maintainers = with lib.maintainers; [ galen ]; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a83002aebf74..1fbbfb9af1a3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1853,7 +1853,6 @@ mapAliases ({ ); # Added 2022-08-02 xpraGtk3 = throw "'xpraGtk3' has been renamed to/replaced by 'xpra'"; # Converted to throw 2022-02-22 xtrt = throw "xtrt has been removed due to being abandoned"; # Added 2023-05-25 - xv = xxv; # Added 2020-02-22 xvidcap = throw "'xvidcap' has been removed because of a broken dependency"; # Added 2022-11-08 xvfb_run = xvfb-run; # Added 2021-05-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 615184502a53..d2ab93d3987b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36145,6 +36145,8 @@ with pkgs; xnotify = callPackage ../tools/X11/xnotify { }; + xv = callPackage ../applications/graphics/xv { }; + xygrib = libsForQt5.callPackage ../applications/misc/xygrib { }; xzgv = callPackage ../applications/graphics/xzgv { };