freelens-bin: darwin build now uses _7zz instead of undmg for APFS DMG support (#469083)
This commit is contained in:
@@ -5,7 +5,8 @@
|
||||
src,
|
||||
passthru,
|
||||
meta,
|
||||
undmg,
|
||||
_7zz,
|
||||
autoSignDarwinBinariesHook,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
@@ -19,16 +20,18 @@ stdenvNoCC.mkDerivation {
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
nativeBuildInputs = [ undmg ];
|
||||
# APFS format is unsupported by undmg
|
||||
nativeBuildInputs = [
|
||||
_7zz
|
||||
autoSignDarwinBinariesHook
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p "$out/Applications"
|
||||
cp -R "Freelens.app" "$out/Applications/Freelens.app"
|
||||
cp -R Freelens*/Freelens.app "$out/Applications/Freelens.app"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
dontFixup = true;
|
||||
}
|
||||
|
||||
@@ -5,7 +5,8 @@
|
||||
lib,
|
||||
appimageTools,
|
||||
makeWrapper,
|
||||
undmg,
|
||||
_7zz,
|
||||
darwin,
|
||||
writeShellScript,
|
||||
nix-update,
|
||||
jq,
|
||||
@@ -81,8 +82,9 @@ if stdenv.hostPlatform.isDarwin then
|
||||
src
|
||||
passthru
|
||||
meta
|
||||
undmg
|
||||
_7zz
|
||||
;
|
||||
autoSignDarwinBinariesHook = darwin.autoSignDarwinBinariesHook;
|
||||
}
|
||||
else
|
||||
import ./linux.nix {
|
||||
|
||||
Reference in New Issue
Block a user