Unverified Commit d103a97f authored by Illia Bobyr's avatar Illia Bobyr
Browse files

nomacs: 3.21.1 -> 3.22.0

Diff: https://github.com/nomacs/nomacs/compare/3.21.1...3.22.0

Changelog: https://github.com/nomacs/nomacs/releases/tag/3.22.0

`novomesk/nomacs-plugins` was merged into the main `nomacs/nomacs`
repository in:

```gitcommit
commit 326ce6257865c710464d818ed6a880a0116058be
Merge: 03997 20101
Author: Scrubs <scrubbbbs@gmail.com>
Date:   Mon Jun 23 19:43:44 2025 -0500

    Add 'ImageLounge/plugins/' from commit '20101da282f13d3184ece873388e1c234a79b5e7'

    git-subtree-dir: ImageLounge/plugins
    git-subtree-mainline: 0399773e3cdce75aca6b591f6ffd71a9362e9d8b
    git-subtree-split: 20101da282f13d3184ece873388e1c234a79b5e7
```

It has been updated to compile with Qt6 and reformatted.  While
`novomesk/nomacs-plugins` does not compile with 3.22.0 any more, due to
the Qt version update.
parent f390f49c
Loading
Loading
Loading
Loading
+2 −16
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@
}:
stdenv.mkDerivation (finalAttrs: {
  pname = "nomacs";
  version = "3.21.1";
  hash = "sha256-RRa19vj7iTtGzdssdtHVOsDzS4X+p1HeiZKy8EIWxq8=";
  version = "3.22.0";
  hash = "sha256-yheDM92AtojGXCx0UrK5gBvQgyGSxcsKPzl93HpHRt8=";

  src = fetchFromGitHub {
    owner = "nomacs";
@@ -24,13 +24,6 @@ stdenv.mkDerivation (finalAttrs: {
    inherit (finalAttrs) hash;
  };

  plugins = fetchFromGitHub {
    owner = "novomesk";
    repo = "nomacs-plugins";
    rev = "20101da282f13d3184ece873388e1c234a79b5e7";
    hash = "sha256-gcRc4KoWJQ5BirhLuk+c+5HwBeyQtlJ3iyX492DXeVk=";
  };

  outputs = [
    "out"
  ]
@@ -39,13 +32,6 @@ stdenv.mkDerivation (finalAttrs: {

  sourceRoot = "${finalAttrs.src.name}/ImageLounge";

  postUnpack = ''
    rm -rf $sourceRoot/plugins
    mkdir $sourceRoot/plugins
    cp -r ${finalAttrs.plugins}/* $sourceRoot/plugins/
    chmod -R +w $sourceRoot/plugins
  '';

  nativeBuildInputs = [
    cmake
    qt6.wrapQtAppsHook