diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-05-18 21:09:27 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-05-18 21:09:27 +0200 |
| commit | 7f40cfd97b4df5bcb039c0efb0710abf47b849b8 (patch) | |
| tree | 4e50776f6c5bec1482844b1637e5fe9aa3c37d88 /pkgs/applications/graphics/nomacs/default.nix | |
| parent | ade7faea7214fbb7d0879804e59b3fb9a61d6268 (diff) | |
| parent | 567f0a3df11b67572a52a05766fe258787bace9a (diff) | |
| download | nixlib-7f40cfd97b4df5bcb039c0efb0710abf47b849b8.tar nixlib-7f40cfd97b4df5bcb039c0efb0710abf47b849b8.tar.gz nixlib-7f40cfd97b4df5bcb039c0efb0710abf47b849b8.tar.bz2 nixlib-7f40cfd97b4df5bcb039c0efb0710abf47b849b8.tar.lz nixlib-7f40cfd97b4df5bcb039c0efb0710abf47b849b8.tar.xz nixlib-7f40cfd97b4df5bcb039c0efb0710abf47b849b8.tar.zst nixlib-7f40cfd97b4df5bcb039c0efb0710abf47b849b8.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/applications/graphics/nomacs/default.nix')
| -rw-r--r-- | pkgs/applications/graphics/nomacs/default.nix | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index f0d9329bc5a9..a6bda01ebb64 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -18,25 +18,15 @@ mkDerivation rec { pname = "nomacs"; - version = "3.12"; + version = "3.14.2"; src = fetchFromGitHub { owner = "nomacs"; repo = "nomacs"; rev = version; - sha256 = "12582i5v85da7vwjxj8grj99hxg34ij5cn3b1578wspdfw1xfy1i"; + sha256 = "1vms13kyg7cpqi2hxvrrhlnl7cq92ijr7dm1kl5ryglpcagqv811"; }; - patches = [ - ./nomacs-iostream.patch - (fetchpatch { - name = "darwin-less-restrictive-opencv.patch"; - url = "https://github.com/nomacs/nomacs/commit/d182fce4bcd9a25bd15e3de065ca67849a32458c.patch"; - sha256 = "0j6sviwrjn69nqf59hjn30c4j838h8az7rnlwcx8ymlb21vd9x2h"; - stripLen = 1; - }) - ]; - enableParallelBuilding = true; setSourceRoot = '' |