3 files changed, 23 insertions, 14 deletions
diff --git a/pkgs/tools/graphics/amber/default.nix b/pkgs/tools/graphics/amber/default.nix
index f5156dd08abfc..4e1948ce87fb9 100644
--- a/pkgs/tools/graphics/amber/default.nix
+++ b/pkgs/tools/graphics/amber/default.nix
@@ -10,48 +10,48 @@ let
   glslang = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "glslang";
-    rev = "3ee5f2f1d3316e228916788b300d786bb574d337";
-    sha256 = "1l5h9d92mzd35pgs0wibqfg7vbl771lwnvdlcsyhf6999khn5dzv";
+    rev = "81cc10a498b25a90147cccd6e8939493c1e9e20e";
+    hash = "sha256-jTOxZ1nU7kvtdWjPzyIp/5ZeKw3JtYyqhlFeIE7CyX8=";
   };
 
   lodepng = fetchFromGitHub {
     owner = "lvandeve";
     repo = "lodepng";
-    rev = "34628e89e80cd007179b25b0b2695e6af0f57fac";
-    sha256 = "10yaf218xnmhv7rsq6dysqrps43r30cgrs1z63h47z40x43ikia0";
+    rev = "5601b8272a6850b7c5d693dd0c0e16da50be8d8d";
+    hash = "sha256-dD8QoyOoGov6VENFNTXWRmen4nYYleoZ8+4TpICNSpo=";
   };
 
   shaderc = fetchFromGitHub {
     owner = "google";
     repo = "shaderc";
-    rev = "ba92b11e1fcaf4c38a64f84d643d6429175bf650";
-    sha256 = "041hip43siy2sr7h6habk9sxdmd45ag4kqgi8jk0vm1b8pqzkhqn";
+    rev = "e72186b66bb90ed06aaf15cbdc9a053581a0616b";
+    hash = "sha256-hd1IGsWksgAfB8Mq5yZOzSyNGxXsCJxb350pD/Gcskk=";
   };
 
   spirv-headers = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "SPIRV-Headers";
-    rev = "3fdabd0da2932c276b25b9b4a988ba134eba1aa6";
-    sha256 = "17h5cn4dyw8ixp1cpw8vf1z90m0fn1hhlvh0iycmknccbb1z34q7";
+    rev = "b42ba6d92faf6b4938e6f22ddd186dbdacc98d78";
+    hash = "sha256-ks9JCj5rj+Xu++7z5RiHDkU3/sFXhcScw8dATfB/ot0=";
   };
 
   spirv-tools = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "SPIRV-Tools";
-    rev = "fd3cabd8b5fc43ce83884ac06486c283b9902b4f";
-    sha256 = "1h3smicw5gzpa17syb30085zccydzs4f41fl30bcmiipdn2xfpjr";
+    rev = "a73e724359a274d7cf4f4248eba5be1e7764fbfd";
+    hash = "sha256-vooJHtgVRlBNkQG4hulYOxIgHH4GMhXw7N4OEbkKJvU=";
   };
 
 in
 stdenv.mkDerivation rec {
   pname = "amber";
-  version = "unstable-2020-09-23";
+  version = "unstable-2022-04-21";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = pname;
-    rev = "0eee2d45d053dfc566baa58442a9b1b708e4f2a7";
-    sha256 = "1rrbvmn9hvhj7xj89yqvy9mx0vg1qapdm5fkca8mkd3516d9f5pw";
+    rev = "8b145a6c89dcdb4ec28173339dd176fb7b6f43ed";
+    hash = "sha256-+xFYlUs13khT6r475eJJ+XS875h2sb+YbJ8ZN4MOSAA=";
   };
 
   buildInputs = [
diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix
index beaf2c1f213dc..ac777051d10ad 100644
--- a/pkgs/tools/graphics/cuneiform/default.nix
+++ b/pkgs/tools/graphics/cuneiform/default.nix
@@ -20,6 +20,12 @@ stdenv.mkDerivation {
   })
   ];
 
+  # Workaround build failure on -fno-common toolchains like upstream
+  # gcc-10. Otherwise build fails as:
+  #   ld: CMakeFiles/rbal.dir/src/statsearchbl.cpp.o:(.bss+0x0):
+  #     multiple definition of `minrow'; CMakeFiles/rbal.dir/src/linban.c.o:(.bss+0xa3a): first defined here
+  NIX_CFLAGS_COMPILE = "-fcommon";
+
   postPatch = ''
     rm cuneiform_src/Kern/hhh/tigerh/h/strings.h
   '';
diff --git a/pkgs/tools/graphics/ploticus/default.nix b/pkgs/tools/graphics/ploticus/default.nix
index 50b7aad48a040..f315dc9a63c08 100644
--- a/pkgs/tools/graphics/ploticus/default.nix
+++ b/pkgs/tools/graphics/ploticus/default.nix
@@ -4,6 +4,7 @@
 , zlib
 , libX11
 , libpng
+, libjpeg
 , gd
 , freetype
 }:
@@ -36,6 +37,7 @@ stdenv.mkDerivation rec {
     libpng
     gd
     freetype
+    libjpeg
   ];
 
   hardeningDisable = [ "format" ];
@@ -43,6 +45,7 @@ stdenv.mkDerivation rec {
   preBuild = ''
     cd src
   '';
+  makeFlags = [ "CC=cc" ];
 
   preInstall = ''
     mkdir -p "$out/bin"
@@ -72,6 +75,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ pSub ];
     homepage = "http://ploticus.sourceforge.net/";
-    platforms = with platforms; linux;
+    platforms = with platforms; linux ++ darwin;
   };
 }