Merge staging-next into staging

2021-05-12 18:32:29 +00:00
parent a605e0318d f214722172
commit b057978bb2
48 changed files with 373 additions and 145 deletions
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {

  unpackPhase = lib.optionalString stdenv.isDarwin ''
    xar -xf $src
-    zcat Payload | cpio -i
+    zcat op.pkg/Payload | cpio -i
  '';

  installPhase = ''