Merge master into staging-next

pkgs/applications/graphics/emulsion/default.nix

@@ -63,17 +63,10 @@ rustPlatform.buildRustPackage rec {
     OpenGL
   ];
 
-  installPhase = ''
-    runHook preInstall
-    install -D $releaseDir/emulsion $out/bin/emulsion
-  '' + lib.optionalString stdenv.isLinux ''
-      patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/emulsion
-  '' + ''
-    runHook postInstall
+  postFixup = lib.optionalString stdenv.isLinux ''
+    patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/emulsion
   '';
 
-  dontPatchELF = true;
-
   meta = with lib; {
     description = "A fast and minimalistic image viewer";
     homepage = "https://arturkovacs.github.io/emulsion-website/";

pkgs/applications/graphics/renderdoc/default.nix

@@ -13,14 +13,14 @@ let
   pythonPackages = python3Packages;
 in
 mkDerivation rec {
-  version = "1.12";
+  version = "1.13";
   pname = "renderdoc";
 
   src = fetchFromGitHub {
     owner = "baldurk";
     repo = "renderdoc";
     rev = "v${version}";
-    sha256 = "4k0WsTsz4WwPZC8Dj85l2ntJOZkLgmBBOJcX9Bb4U7I=";
+    sha256 = "MBvdnB1YPeCaXSgqqtGs0SMocbarjmaWtIUkBBCvufc=";
   };
 
   buildInputs = [