Commit 7d15e810 authored by Weijia Wang's avatar Weijia Wang
Browse files

treewide: remove unpackCmd involving 7zz

parent f514e5c5
Loading
Loading
Loading
Loading
+0 −8
Original line number Diff line number Diff line
@@ -14,14 +14,6 @@ stdenv.mkDerivation rec {
  };

  # MonitorControl.${version}.dmg is APFS formatted, unpack with 7zz
  unpackCmd = ''
    runHook preUnpack

    7zz x $src

    runHook postUnpack
  '';

  nativeBuildInputs = [ _7zz ];

  sourceRoot = "MonitorControl.app";
+2 −10
Original line number Diff line number Diff line
@@ -39,20 +39,12 @@ if stdenv.isDarwin then stdenv.mkDerivation {

  sourceRoot = ".";

  nativeBuildInputs = [ _7zz ];

  buildInputs = [ jdk21 ];

  # DMG file is using APFS which is unsupported by "undmg".
  # Instead, use "7zz" to extract the contents.
  # "undmg" issue: https://github.com/matthewbauer/undmg/issues/4
  unpackCmd = ''
    runHook preUnpack

    7zz x $curSrc
  nativeBuildInputs = [ _7zz ];

    runHook postUnpack
  '';
  buildInputs = [ jdk21 ];

  installPhase = ''
    runHook preInstall
+1 −3
Original line number Diff line number Diff line
@@ -68,9 +68,7 @@ in stdenvNoCC.mkDerivation ({

  dontUnpack = stdenvNoCC.isLinux;

  unpackPhase = if stdenvNoCC.isDarwin then ''
    7zz x $src
  '' else null;
  sourceRoot = if stdenvNoCC.isDarwin then "." else null;

  nativeBuildInputs = [ validatePkgConfig ] ++ (if stdenvNoCC.isDarwin
    then
+1 −9
Original line number Diff line number Diff line
@@ -19,16 +19,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
  dontBuild = true;
  dontFixup = true;

  nativeBuildInputs = [ _7zz ];

  # AirBuddy.dmg is APFS formatted, unpack with 7zz
  unpackCmd = ''
    runHook preUnpack

    7zz x $src

    runHook postUnpack
  '';
  nativeBuildInputs = [ _7zz ];

  sourceRoot = "AirBuddy.app";

+1 −9
Original line number Diff line number Diff line
@@ -16,16 +16,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
  dontBuild = true;
  dontFixup = true;

  nativeBuildInputs = [ _7zz ];

  # AlDente.dmg is APFS formatted, unpack with 7zz
  unpackCmd = ''
    runHook preUnpack

    7zz x $src

    runHook postUnpack
  '';
  nativeBuildInputs = [ _7zz ];

  sourceRoot = "AlDente.app";

Loading