diff options
author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-09-25 21:36:31 +0200 |
---|---|---|
committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-09-25 21:36:31 +0200 |
commit | 68c0ca4416f0d36d37fc2dd0659ccd1ca152f593 (patch) | |
tree | 41cf60fbd3ed13ca6827f589f369f4e9b49b3919 /pkgs/applications/graphics | |
parent | 86afd1c57926318e3299a9cae2cd0130eb694614 (diff) | |
parent | 5fa1488e2b0effad849125784310f17b16f59004 (diff) |
Merge remote-tracking branch 'origin/master' into staging-next
Diffstat (limited to 'pkgs/applications/graphics')
5 files changed, 15 insertions, 11 deletions
diff --git a/pkgs/applications/graphics/eyedropper/default.nix b/pkgs/applications/graphics/eyedropper/default.nix index 6344835222346..fdb56440ed13d 100644 --- a/pkgs/applications/graphics/eyedropper/default.nix +++ b/pkgs/applications/graphics/eyedropper/default.nix @@ -15,19 +15,19 @@ stdenv.mkDerivation rec { pname = "eyedropper"; - version = "0.2.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "FineFindus"; repo = pname; - rev = "v${version}"; - hash = "sha256-xyvnnWts+VuUFlV/o1cGOM7482ReiHVsn+AfdExYBTM="; + rev = version; + hash = "sha256-dOB274OA7h1vwCuapzivHnMLLw/NTzsmOfFtHHaca1I="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-8G1fJ5YiUAzMqDoIjWGDTvtPw8chkxPrOz/c9WZRbhM="; + hash = "sha256-ymRl/nIUuT1BXa1dF5CMemBI8aYrdqeoVtghm6NF8cs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 646594d4afba7..94c30fe0a3213 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -30,6 +30,7 @@ , wayland , wayland-protocols , qtwayland +, cairo }: mkDerivation rec { @@ -61,7 +62,7 @@ mkDerivation rec { buildInputs = [ eigen boost glew opencsg cgal mpfr gmp glib harfbuzz lib3mf libzip double-conversion freetype fontconfig - qtbase qtmultimedia qscintilla + qtbase qtmultimedia qscintilla cairo ] ++ lib.optionals stdenv.isLinux [ libGLU libGL wayland wayland-protocols qtwayland ] ++ lib.optional stdenv.isDarwin qtmacextras ++ lib.optional spacenavSupport libspnav diff --git a/pkgs/applications/graphics/unigine-sanctuary/default.nix b/pkgs/applications/graphics/unigine-sanctuary/default.nix index 4b3f3ab547c66..b62df6f56eea0 100644 --- a/pkgs/applications/graphics/unigine-sanctuary/default.nix +++ b/pkgs/applications/graphics/unigine-sanctuary/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec{ version = "2.3"; src = fetchurl { - url = "https://m12-assets.unigine.com/d/Unigine_Sanctuary-${version}.run"; - sha256 = "1m9r79q33hx213zg3c2kknnc7hi8jp2h88s9qynny4k4rg8vpa18"; + url = "https://assets.unigine.com/d/Unigine_Sanctuary-${version}.run"; + sha256 = "sha256-KKi70ctkEm+tx0kjBMWVKMLDrJ1TsPH+CKLDMXA6OdU="; }; libPath = lib.makeLibraryPath [ @@ -94,5 +94,6 @@ stdenv.mkDerivation rec{ license = lib.licenses.unfree; maintainers = [ lib.maintainers.BarinovMaxim ]; platforms = [ "x86_64-linux" "i686-linux" ]; + mainProgram = "Sanctuary"; }; } diff --git a/pkgs/applications/graphics/unigine-tropics/default.nix b/pkgs/applications/graphics/unigine-tropics/default.nix index f0d5101b4be02..f75aa81e45f53 100644 --- a/pkgs/applications/graphics/unigine-tropics/default.nix +++ b/pkgs/applications/graphics/unigine-tropics/default.nix @@ -22,8 +22,8 @@ stdenv.mkDerivation { inherit version; src = fetchurl { - url = "http://m12-assets.unigine.com/d/Unigine_Tropics-${version}.run"; - sha256 = "0icasdp46fjnic7gk83pknjx0gpap9j202dm0llcfg5zin5kbq7x"; + url = "https://assets.unigine.com/d/Unigine_Tropics-${version}.run"; + sha256 = "sha256-/eA1i42/PMcoBbUJIGS66j7QpZ13oPkOi1Y6Q27TikU="; }; libPath = lib.makeLibraryPath [ @@ -92,5 +92,6 @@ stdenv.mkDerivation { license = lib.licenses.unfree; maintainers = [ lib.maintainers.BarinovMaxim ]; platforms = [ "x86_64-linux" "i686-linux" ]; + mainProgram = "Tropics"; }; } diff --git a/pkgs/applications/graphics/unigine-valley/default.nix b/pkgs/applications/graphics/unigine-valley/default.nix index ee1c9e6c15f89..6d73cf82cd66e 100644 --- a/pkgs/applications/graphics/unigine-valley/default.nix +++ b/pkgs/applications/graphics/unigine-valley/default.nix @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { inherit version; src = fetchurl { - url = "https://m11-assets.unigine.com/d/Unigine_Valley-${version}.run"; - sha256 = "5f0c8bd2431118551182babbf5f1c20fb14e7a40789697240dcaf546443660f4"; + url = "https://assets.unigine.com/d/Unigine_Valley-${version}.run"; + sha256 = "sha256-XwyL0kMRGFURgrq79fHCD7FOekB4lpckDcr1RkQ2YPQ="; }; sourceRoot = "Unigine_Valley-${version}"; @@ -132,6 +132,7 @@ stdenv.mkDerivation rec { license = lib.licenses.unfree; # see also: $out/$instPath/documentation/License.pdf maintainers = [ lib.maintainers.kierdavis ]; platforms = [ "x86_64-linux" "i686-linux" ]; + mainProgram = "valley"; }; } |