diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-11-21 16:12:21 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-11-21 16:12:48 +0100 |
commit | 048a4cd441a59cbf89defb18bb45c9f0b4429b35 (patch) | |
tree | f8f5850ff05521ab82d65745894714a8796cbfb6 /pkgs/applications/graphics/nomacs/default.nix | |
parent | 030c5028b07afcedce7c5956015c629486cc79d9 (diff) | |
parent | 4c2d05dd6435d449a3651a6dd314d9411b5f8146 (diff) | |
download | nixpkgs-rootfs.tar nixpkgs-rootfs.tar.gz nixpkgs-rootfs.tar.bz2 nixpkgs-rootfs.tar.lz nixpkgs-rootfs.tar.xz nixpkgs-rootfs.tar.zst nixpkgs-rootfs.zip |
Signed-off-by: Alyssa Ross <hi@alyssa.is>
Diffstat (limited to 'pkgs/applications/graphics/nomacs/default.nix')
-rw-r--r-- | pkgs/applications/graphics/nomacs/default.nix | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index 7c909de9f84..a5898a3ac00 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -1,10 +1,9 @@ -{ stdenv -, lib -, mkDerivation +{ lib +, stdenv , fetchFromGitHub -, fetchpatch , cmake , pkg-config +, wrapQtAppsHook , qtbase , qttools @@ -18,32 +17,24 @@ , quazip }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "nomacs"; - version = "3.17.2206"; + version = "3.17.2287"; src = fetchFromGitHub { owner = "nomacs"; repo = "nomacs"; rev = version; - sha256 = "1bq7bv4p7w67172y893lvpk90d6fgdpnylynbj2kn8m2hs6khya4"; + hash = "sha256-OwiMB6O4+WuAt87sRbD1Qby3U7igqgCgddiWs3a4j3k="; }; - patches = [ - # Add support for Quazip 1.x. - (fetchpatch { - url = "https://github.com/nomacs/nomacs/pull/576.patch"; - sha256 = "11ryjvd9jbb0cqagai4a6980jfq8lrcbyw2d7z9yld1f42w9kbxm"; - stripLen = 1; - }) - ]; - setSourceRoot = '' sourceRoot=$(echo */ImageLounge) ''; nativeBuildInputs = [cmake - pkg-config]; + pkg-config + wrapQtAppsHook]; buildInputs = [qtbase qttools @@ -62,13 +53,16 @@ mkDerivation rec { "-DENABLE_TRANSLATIONS=ON" "-DUSE_SYSTEM_QUAZIP=ON"]; + postInstall = lib.optionalString stdenv.isDarwin '' + mkdir -p $out/lib + mv $out/libnomacsCore.dylib $out/lib/libnomacsCore.dylib + ''; + meta = with lib; { homepage = "https://nomacs.org"; description = "Qt-based image viewer"; maintainers = with lib.maintainers; [ mindavi ]; license = licenses.gpl3Plus; inherit (qtbase.meta) platforms; - # Broken on hydra since 2020-08-15: https://hydra.nixos.org/build/125495291 (bump from 3.16 to 3.17 prerelease) - broken = stdenv.isDarwin; }; } |