about summary refs log tree commit diff
diff options
context:
space:
mode:
authorGalen Huntington <galen@alumni.reed.edu>2023-07-03 19:30:33 -0700
committerGalen Huntington <galen@alumni.reed.edu>2023-07-07 09:27:26 -0700
commit4dd813ffa0c8594f3506c7f9fd6625e3b8c38a42 (patch)
tree9161836a044153fcfef220990cd72843b2f8fb27
parentf979f99b32c62e701e5f29f9acfd643ad8cf6626 (diff)
xv: init at 4.1.1
-rw-r--r--pkgs/applications/graphics/xv/default.nix38
-rw-r--r--pkgs/top-level/aliases.nix1
-rw-r--r--pkgs/top-level/all-packages.nix2
3 files changed, 40 insertions, 1 deletions
diff --git a/pkgs/applications/graphics/xv/default.nix b/pkgs/applications/graphics/xv/default.nix
new file mode 100644
index 0000000000000..8b26c42b9cac1
--- /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 8e12893e27e03..10e25d1a7c622 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1847,7 +1847,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 4c79afe4956be..380b227659389 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -36094,6 +36094,8 @@ with pkgs;
 
   xnotify = callPackage ../tools/X11/xnotify { };
 
+  xv = callPackage ../applications/graphics/xv { };
+
   xygrib = libsForQt5.callPackage ../applications/misc/xygrib { };
 
   xzgv = callPackage ../applications/graphics/xzgv { };