Unverified Commit f227f12d authored by Rick van Schijndel's avatar Rick van Schijndel Committed by GitHub
Browse files

Merge pull request #258287 from wegank/nomacs-bump 

nomacs: 3.17.2206 -> 3.17.2285
parents 57b9568f bf60265e

pkgs/applications/graphics/nomacs/default.nix

+13 −19
Original line number Diff line number Diff line 
{ 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.2285";



  src = fetchFromGitHub {

    owner = "nomacs";

    repo = "nomacs";

    rev = version;

    sha256 = "1bq7bv4p7w67172y893lvpk90d6fgdpnylynbj2kn8m2hs6khya4";

    hash = "sha256-/K7LRPwNy2PG7tIGD0tiKnEOPZ491lxFRlgf4xWYtxs=";

  };



  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;

  };

}