diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-02-21 07:54:33 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-02-21 07:54:33 +0100 |
| commit | e2cd07b9978198696681776405c4e23526d483a7 (patch) | |
| tree | 3986a58bee29938ea6fd1ef205fcd526ba7dec67 /pkgs/applications/graphics | |
| parent | c9b14043f0e66fff8facd866c0786b414e0765c1 (diff) | |
| parent | c9d8f5235bd9201355a7817cab79d38a8bc6e731 (diff) | |
| download | nixpkgs-e2cd07b9978198696681776405c4e23526d483a7.tar nixpkgs-e2cd07b9978198696681776405c4e23526d483a7.tar.gz nixpkgs-e2cd07b9978198696681776405c4e23526d483a7.tar.bz2 nixpkgs-e2cd07b9978198696681776405c4e23526d483a7.tar.lz nixpkgs-e2cd07b9978198696681776405c4e23526d483a7.tar.xz nixpkgs-e2cd07b9978198696681776405c4e23526d483a7.tar.zst nixpkgs-e2cd07b9978198696681776405c4e23526d483a7.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/ahoviewer/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/graphics/openscad/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/applications/graphics/paraview/default.nix | 4 |
3 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix index 596570092a9..5210af4df7a 100644 --- a/pkgs/applications/graphics/ahoviewer/default.nix +++ b/pkgs/applications/graphics/ahoviewer/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libconfig, - gtkmm2, glibmm, libxml2, libsecret, curl, libzip, - librsvg, gst_all_1, autoreconfHook, makeWrapper, - useUnrar ? false, unrar +{ config, stdenv, fetchFromGitHub, pkgconfig, libconfig +, gtkmm2, glibmm, libxml2, libsecret, curl, libzip +, librsvg, gst_all_1, autoreconfHook, makeWrapper +, useUnrar ? config.ahoviewer.useUnrar or false, unrar }: assert useUnrar -> unrar != null; diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 44855d5c8b4..bce2e882698 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -28,6 +28,9 @@ stdenv.mkDerivation rec { qmakeFlags = [ "VERSION=${version}" ]; + # src/lexer.l:36:10: fatal error: parser.hxx: No such file or directory + enableParallelBuilding = false; # true by default due to qmake + doCheck = false; meta = { diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 9839bb74077..cf13c6fb05e 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -6,7 +6,7 @@ stdenv, fetchFromGitHub, cmake, makeWrapper stdenv.mkDerivation rec { name = "paraview-${version}"; - version = "5.5.2"; + version = "5.6.0"; # fetching from GitHub instead of taking an "official" source # tarball because of missing submodules there @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "Kitware"; repo = "ParaView"; rev = "v${version}"; - sha256 = "1jivph7lppnflmjsiirhgv0mnh8mxx41i1vzkk78ynn00rzacx3j"; + sha256 = "1j13yfdgcv4yzfr449i4c8r4rs1c9zr6qd3igr4vv3ani8zixkzi"; fetchSubmodules = true; }; |