treewide: remove unpackCmd involving 7zz
This commit is contained in:
parent
f514e5c53d
commit
7d15e810d7
7 changed files with 6 additions and 43 deletions
|
@ -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";
|
||||
|
|
|
@ -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
|
||||
nativeBuildInputs = [ _7zz ];
|
||||
|
||||
7zz x $curSrc
|
||||
|
||||
runHook postUnpack
|
||||
'';
|
||||
buildInputs = [ jdk21 ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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";
|
||||
|
||||
|
|
|
@ -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";
|
||||
|
||||
|
|
|
@ -15,7 +15,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
|||
|
||||
# APFS format is unsupported by undmg
|
||||
nativeBuildInputs = [ _7zz ];
|
||||
unpackCmd = "7zz x $curSrc";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
|
|
@ -42,9 +42,7 @@ stdenv.mkDerivation rec {
|
|||
autoPatchelfHook
|
||||
];
|
||||
|
||||
unpackPhase = if stdenv.hostPlatform.isDarwin then ''
|
||||
7zz x $src
|
||||
'' else null;
|
||||
sourceRoot = if stdenv.isDarwin then "." else null;
|
||||
|
||||
installPhase =
|
||||
if stdenv.hostPlatform.system == "x86_64-linux" then
|
||||
|
|
Loading…
Reference in a new issue