Skip to content

Commit

Permalink
appimage: unify extract functions
Browse files Browse the repository at this point in the history
  • Loading branch information
Bignaux Ronan committed Mar 3, 2020
1 parent ebaedb5 commit 04037d1
Showing 1 changed file with 22 additions and 21 deletions.
43 changes: 22 additions & 21 deletions pkgs/build-support/appimage/default.nix
Original file line number Diff line number Diff line change
@@ -1,39 +1,40 @@
{ stdenv, libarchive, radare2, jq, buildFHSUserEnv, squashfsTools, writeScript }:

rec {
# Both extraction functions could be unified, but then
# it would depend on libmagic to correctly identify ISO 9660s

extractType1 = { name, src }: stdenv.mkDerivation {
extract = { name, src }: stdenv.mkDerivation {
name = "${name}-extracted";
inherit src;

nativeBuildInputs = [ libarchive ];
nativeBuildInputs = [ radare2 libarchive jq squashfsTools ];
buildCommand = ''
mkdir $out
bsdtar -x -C $out -f $src
'';
};
# https://github.com/AppImage/libappimage/blob/ca8d4b53bed5cbc0f3d0398e30806e0d3adeaaab/src/libappimage/utils/MagicBytesChecker.cpp#L45-L63
appimageType=$(r2 $src -nn -Nqc "p8 3 @ 8")
case "$appimageType" in
414901)
mkdir $out
bsdtar -x -C $out -f $src;;
extractType2 = { name, src }: stdenv.mkDerivation {
name = "${name}-extracted";
inherit src;
414902)
install $src ./appimage
nativeBuildInputs = [ radare2 jq squashfsTools ];
buildCommand = ''
install $src ./appimage
# multiarch offset one-liner using same method as AppImage
# see https://gist.github.com/probonopd/a490ba3401b5ef7b881d5e603fa20c93
offset=$(r2 ./appimage -nn -Nqc "pfj.elf_header @ 0" |\
jq 'map({(.name): .value}) | add | .shoff + (.shnum * .shentsize)')
# multiarch offset one-liner using same method as AppImage
# see https://gist.github.com/probonopd/a490ba3401b5ef7b881d5e603fa20c93
offset=$(r2 ./appimage -nn -Nqc "pfj.elf_header @ 0" |\
jq 'map({(.name): .value}) | add | .shoff + (.shnum * .shentsize)')
unsquashfs -o $offset ./appimage
unsquashfs -o $offset ./appimage
cp -rv squashfs-root $out;;
cp -rv squashfs-root $out
# 414903) get prepared, https://github.com/TheAssassin/type3-runtime
*) echo "Unsupported AppImage Signature: $appimageType";;
esac
'';
};

extractType1 = extract;
extractType2 = extract;

wrapAppImage = args@{ name, src, extraPkgs, ... }: buildFHSUserEnv (defaultFhsEnvArgs // {
inherit name;

Expand Down

0 comments on commit 04037d1

Please sign in to comment.