diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-05-18 21:09:48 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-05-18 21:09:48 +0200 |
| commit | f8a9c6efac0199d72884e82117636b5896b7e202 (patch) | |
| tree | db5a22587988bce5c645768fc9b40556f5708493 /pkgs/applications/graphics/nomacs/default.nix | |
| parent | 682b7c2a1936c4d4298ce10629f2bd99d2fb54fb (diff) | |
| parent | 7f40cfd97b4df5bcb039c0efb0710abf47b849b8 (diff) | |
| download | nixlib-f8a9c6efac0199d72884e82117636b5896b7e202.tar nixlib-f8a9c6efac0199d72884e82117636b5896b7e202.tar.gz nixlib-f8a9c6efac0199d72884e82117636b5896b7e202.tar.bz2 nixlib-f8a9c6efac0199d72884e82117636b5896b7e202.tar.lz nixlib-f8a9c6efac0199d72884e82117636b5896b7e202.tar.xz nixlib-f8a9c6efac0199d72884e82117636b5896b7e202.tar.zst nixlib-f8a9c6efac0199d72884e82117636b5896b7e202.zip | |
Merge branch 'staging-next' into staging
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 = '' |