From 86adc4bf3e0d45ada9914667878721f04266d553 Mon Sep 17 00:00:00 2001 From: Bryan Lai Date: Thu, 22 May 2025 23:41:13 +0800 Subject: [PATCH 1/2] djview: move to pkgs/by-name --- .../djview/default.nix => by-name/dj/djview/package.nix} | 0 pkgs/top-level/all-packages.nix | 1 - 2 files changed, 1 deletion(-) rename pkgs/{applications/graphics/djview/default.nix => by-name/dj/djview/package.nix} (100%) diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/by-name/dj/djview/package.nix similarity index 100% rename from pkgs/applications/graphics/djview/default.nix rename to pkgs/by-name/dj/djview/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d775e24bc64a..4788211ab2f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12149,7 +12149,6 @@ with pkgs; djv = callPackage ../by-name/dj/djv/package.nix { openexr = openexr_2; }; - djview = callPackage ../applications/graphics/djview { }; djview4 = djview; dmenu = callPackage ../applications/misc/dmenu { }; From 9fedd72fb8cae009524034b236057fb320b75e8b Mon Sep 17 00:00:00 2001 From: Bryan Lai Date: Thu, 22 May 2025 23:37:30 +0800 Subject: [PATCH 2/2] djview: unbreak for darwin See: https://github.com/macports/macports-ports/blob/ff1d085109367bc578520638e4a4eca757f261d3/aqua/djview/Portfile --- pkgs/by-name/dj/djview/package.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/dj/djview/package.nix b/pkgs/by-name/dj/djview/package.nix index bf8ccce9fe00..557c70912e13 100644 --- a/pkgs/by-name/dj/djview/package.nix +++ b/pkgs/by-name/dj/djview/package.nix @@ -52,16 +52,27 @@ stdenv.mkDerivation rec { "--with-x" "--with-tiff" "--disable-nsdejavu" # 2023-11-14: modern browsers have dropped support for NPAPI - ] ++ lib.optional stdenv.hostPlatform.isDarwin "--enable-mac"; + ]; + + postInstall = + let + Applications = "$out/Applications"; + in + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p ${Applications} + cp -a src/djview.app -t ${Applications} + ''; meta = with lib; { - broken = stdenv.hostPlatform.isDarwin; - description = "Portable DjVu viewer (Qt5) and browser (nsdejavu) plugin"; + description = "Portable DjVu viewer (Qt5)"; mainProgram = "djview"; homepage = "https://djvu.sourceforge.net/djview4.html"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ Anton-Latukha ]; + maintainers = with maintainers; [ + Anton-Latukha + bryango + ]; longDescription = '' The portable DjVu viewer (Qt5) and browser (nsdejavu) plugin.