commit b19590a880204daac307dabe959fb984f5255a31 · pyrox.dev/nixpkgs

+49 -53

pkgs/build-support/appimage/appimage-exec.sh

···

       6
       6
        
       PATH="@path@:$PATH"

     

       7
       7
        
       apprun_opt=true

     

       8
       8
        
       

     

       9
       9
       -
       #DEBUG=0

     

       10
       10
       -
       

     

       11
       9
        
       # src : AppImage

     

       12
       10
        
       # dest : let's unpack() create the directory

     

       13
       11
        
       unpack() {

     

       14
       14
       -
         local src=$1

     

       15
       15
       -
         local out=$2

     

       16
       16
       -
         local appimageSignature=""

     

       17
       17
       -
         local appimageType=0

     

       12
       12
       +
         local src="$1"

     

       13
       13
       +
         local out="$2"

     

       18
       14
        
       

     

       19
       15
        
         # https://github.com/AppImage/libappimage/blob/ca8d4b53bed5cbc0f3d0398e30806e0d3adeaaab/src/libappimage/utils/MagicBytesChecker.cpp#L45-L63

     

       20
       20
       -
         eval "$(r2 -nn -Nqc "p8j 3 @ 8" "$src"|

     

       21
       21
       -
           jq -r '{appimageSignature: (.[:-1]|implode), appimageType: .[-1]}|

     

       22
       22
       -
             @sh "appimageSignature=\(.appimageSignature) appimageType=\(.appimageType)"')"

     

       16
       16
       +
         local appimageSignature=$(readelf -h "$src" | awk 'NR==2{print $10$11;}')

     

       17
       17
       +
         local appimageType=$(readelf -h "$src" | awk 'NR==2{print $12;}')

     

       23
       18
        
       

     

       24
       19
        
         # check AppImage signature

     

       25
       25
       -
         if [[ "$appimageSignature" != "AI" ]]; then

     

       26
       26
       -
           echo "Not an appimage."

     

       20
       20
       +
         if [ "$appimageSignature" != "4149" ]; then

     

       21
       21
       +
           echo "Not an AppImage file"

     

       27
       22
        
           exit

     

       28
       23
        
         fi

     

       29
       24
        
       

     

       30
       25
        
         case "$appimageType" in

     

       31
       31
       -
           1 ) echo "Uncompress $(basename "$src") of type $appimageType."

     

       32
       32
       -
               mkdir "$out"

     

       33
       33
       -
               pv "$src" | bsdtar -x -C "$out" -f -

     

       34
       34
       -
               ;;

     

       35
       35
       -
           2)

     

       36
       36
       -
               # This method avoid issues with non executable appimages,

     

       37
       37
       -
               # non-native packer, packer patching and squashfs-root destination prefix.

     

       26
       26
       +
           "01")

     

       27
       27
       +
             echo "Uncompress $(basename "$src") of type $appimageType"

     

       28
       28
       +
             mkdir "$out"

     

       29
       29
       +
             pv "$src" | bsdtar -x -C "$out" -f -

     

       30
       30
       +
             ;;

     

       38
       31
        
       

     

       39
       39
       -
               # multiarch offset one-liner using same method as AppImage

     

       40
       40
       -
               # see https://gist.github.com/probonopd/a490ba3401b5ef7b881d5e603fa20c93

     

       41
       41
       -
               offset=$(r2 -nn -Nqc "pfj.elf_header @ 0" "$src"|\

     

       42
       42
       -
                 jq 'map({(.name): .value}) | add | .shoff + (.shnum * .shentsize)')

     

       32
       32
       +
           "02")

     

       33
       33
       +
             # This method avoid issues with non executable appimages,

     

       34
       34
       +
             # non-native packer, packer patching and squashfs-root destination prefix.

     

       43
       35
        
       

     

       44
       44
       -
               echo "Uncompress $(basename "$src") of type $appimageType @ offset $offset."

     

       45
       45
       -
               unsquashfs -q -d "$out" -o "$offset" "$src"

     

       46
       46
       -
               chmod go-w "$out"

     

       47
       47
       -
               ;;

     

       36
       36
       +
             # multiarch offset one-liner using same method as AppImage

     

       37
       37
       +
             # see https://gist.github.com/probonopd/a490ba3401b5ef7b881d5e603fa20c93

     

       38
       38
       +
             offset=$(readelf -h "$src" | awk 'NR==13{e_shoff=$5} NR==18{e_shentsize=$5} NR==19{e_shnum=$5} END{print e_shoff+e_shentsize*e_shnum}')

     

       39
       39
       +
             echo "Uncompress $(basename "$src") of type $appimageType @ offset $offset"

     

       40
       40
       +
             unsquashfs -q -d "$out" -o "$offset" "$src"

     

       41
       41
       +
             chmod go-w "$out"

     

       42
       42
       +
             ;;

     

       48
       43
        
       

     

       49
       49
       -
           # 3) get ready, https://github.com/TheAssassin/type3-runtime

     

       50
       50
       -
           *)  echo Unsupported AppImage Type: "$appimageType"

     

       51
       51
       -
               exit

     

       52
       52
       -
               ;;

     

       44
       44
       +
           # "03")

     

       45
       45
       +
           #   get ready, https://github.com/TheAssassin/type3-runtime

     

       46
       46
       +
       

     

       47
       47
       +
           *)

     

       48
       48
       +
             echo Unsupported AppImage Type: "$appimageType"

     

       49
       49
       +
             exit

     

       50
       50
       +
             ;;

     

       53
       51
        
         esac

     

       54
       52
        
         echo "$(basename "$src") is now installed in $out"

     

       55
       53
        
       }

     

       56
       54
        
       

     

       57
       55
        
       apprun() {

     

       58
       56
        
       

     

       59
       59
       -
         eval "$(rahash2 "$APPIMAGE" -j | jq -r '.[] | @sh "SHA256=\(.hash)"')"

     

       60
       60
       -
         echo sha256 = \""$SHA256"\"\;

     

       57
       57
       +
         SHA256=$(sha256sum "$APPIMAGE" | awk '{print $1}')

     

       61
       58
        
         export APPDIR="${XDG_CACHE_HOME:-$HOME/.cache}/appimage-run/$SHA256"

     

       62
       59
        
       

     

       63
       60
        
         #compatibility

     
···

       102
       99
        
       }

     

       103
       100
        
       

     

       104
       101
        
       while getopts "x:w:dh" option; do

     

       105
       105
       -
           case "${option}" in

     

       106
       106
       -
               d)  set -x

     

       107
       107
       -
                   ;;

     

       108
       108
       -
               x)  # eXtract

     

       109
       109
       -
                   unpack_opt=true

     

       110
       110
       -
                   APPDIR=${OPTARG}

     

       111
       111
       -
                   ;;

     

       112
       112
       -
               w)  # WrapAppImage

     

       113
       113
       -
                   export APPDIR=${OPTARG}

     

       114
       114
       -
                   wrap_opt=true

     

       115
       115
       -
                   ;;

     

       116
       116
       -
               h)  usage

     

       117
       117
       -
                   ;;

     

       118
       118
       -
               *)

     

       119
       119
       -
                   usage

     

       120
       120
       -
                   ;;

     

       121
       121
       -
           esac

     

       102
       102
       +
         case "${option}" in

     

       103
       103
       +
           d)  set -x

     

       104
       104
       +
               ;;

     

       105
       105
       +
           x)  # eXtract

     

       106
       106
       +
               unpack_opt=true

     

       107
       107
       +
               APPDIR=${OPTARG}

     

       108
       108
       +
               ;;

     

       109
       109
       +
           w)  # WrapAppImage

     

       110
       110
       +
               export APPDIR=${OPTARG}

     

       111
       111
       +
               wrap_opt=true

     

       112
       112
       +
               ;;

     

       113
       113
       +
           h)  usage

     

       114
       114
       +
               ;;

     

       115
       115
       +
           *)  usage

     

       116
       116
       +
               ;;

     

       117
       117
       +
         esac

     

       122
       118
        
       done

     

       123
       123
       -
       shift $((OPTIND-1))

     

       119
       119
       +
       shift "$((OPTIND-1))"

     

       124
       120
        
       

     

       125
       125
       -
       if [[ $wrap_opt = true ]] && [[ -d "$APPDIR" ]]; then

     

       121
       121
       +
       if [ -n "$wrap_opt" ] && [ -d "$APPDIR" ]; then

     

       126
       122
        
         wrap "$@"

     

       127
       123
        
         exit

     

       128
       124
        
       else

     
···

       130
       126
        
         shift

     

       131
       127
        
       fi

     

       132
       128
        
       

     

       133
       133
       -
       if [[ $unpack_opt = true ]] && [[ -f "$APPIMAGE" ]]; then

     

       129
       129
       +
       if [ -n "$unpack_opt" ] && [ -f "$APPIMAGE" ]; then

     

       134
       130
        
         unpack "$APPIMAGE" "$APPDIR"

     

       135
       131
        
         exit

     

       136
       132
        
       fi

     

       137
       133
        
       

     

       138
       138
       -
       if [[ $apprun_opt = true ]] && [[ -f "$APPIMAGE" ]]; then

     

       134
       134
       +
       if [ -n "$apprun_opt" ] && [ -f "$APPIMAGE" ]; then

     

       139
       135
        
         apprun

     

       140
       136
        
         wrap "$@"

     

       141
       137
        
         exit

+37 -20

pkgs/build-support/appimage/default.nix

···

       1
       1
       -
       { stdenv, buildFHSUserEnv, writeScript, pkgs

     

       2
       2
       -
       , bash, radare2, jq, squashfsTools, ripgrep

     

       3
       3
       -
       , coreutils, libarchive, file, runtimeShell, pv

     

       4
       4
       -
       , lib, runCommand }:

     

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , bash

     

       3
       3
       +
       , binutils-unwrapped

     

       4
       4
       +
       , coreutils

     

       5
       5
       +
       , gawk

     

       6
       6
       +
       , libarchive

     

       7
       7
       +
       , pv

     

       8
       8
       +
       , squashfsTools

     

       9
       9
       +
       , buildFHSUserEnv

     

       10
       10
       +
       , pkgs

     

       11
       11
       +
       }:

     

       5
       12
        
       

     

       6
       13
        
       rec {

     

       7
       14
        
         appimage-exec = pkgs.substituteAll {

     

       8
       15
        
           src = ./appimage-exec.sh;

     

       9
       16
        
           isExecutable = true;

     

       10
       17
        
           dir = "bin";

     

       11
       11
       -
           path = with pkgs; lib.makeBinPath [ pv ripgrep file radare2 libarchive jq squashfsTools coreutils bash ];

     

       18
       18
       +
           path = with pkgs; stdenv.lib.makeBinPath [

     

       19
       19
       +
             bash

     

       20
       20
       +
             binutils-unwrapped

     

       21
       21
       +
             coreutils

     

       22
       22
       +
             gawk

     

       23
       23
       +
             libarchive

     

       24
       24
       +
             pv

     

       25
       25
       +
             squashfsTools

     

       26
       26
       +
           ];

     

       12
       27
        
         };

     

       13
       28
        
       

     

       14
       14
       -
         extract = { name, src }: runCommand "${name}-extracted" {

     

       15
       15
       -
           buildInputs = [ appimage-exec ];

     

       16
       16
       -
         } ''

     

       17
       17
       -
           appimage-exec.sh -x $out ${src}

     

       18
       18
       -
         '';

     

       29
       29
       +
         extract = { name, src }: pkgs.runCommand "${name}-extracted" {

     

       30
       30
       +
             buildInputs = [ appimage-exec ];

     

       31
       31
       +
           } ''

     

       32
       32
       +
             appimage-exec.sh -x $out ${src}

     

       33
       33
       +
           '';

     

       19
       34
        
       

     

       20
       35
        
         # for compatibility, deprecated

     

       21
       36
        
         extractType1 = extract;

     

       22
       37
        
         extractType2 = extract;

     

       23
       38
        
         wrapType1 = wrapType2;

     

       24
       39
        
       

     

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

     

       26
       26
       -
           inherit name;

     

       40
       40
       +
         wrapAppImage = args@{ name, src, extraPkgs, ... }: buildFHSUserEnv

     

       41
       41
       +
           (defaultFhsEnvArgs // {

     

       42
       42
       +
             inherit name;

     

       27
       43
        
       

     

       28
       28
       -
           targetPkgs = pkgs: [ appimage-exec ]

     

       29
       29
       -
             ++ defaultFhsEnvArgs.targetPkgs pkgs ++ extraPkgs pkgs;

     

       44
       44
       +
             targetPkgs = pkgs: [ appimage-exec ]

     

       45
       45
       +
               ++ defaultFhsEnvArgs.targetPkgs pkgs ++ extraPkgs pkgs;

     

       30
       46
        
       

     

       31
       31
       -
           runScript = "appimage-exec.sh -w ${src}";

     

       32
       32
       -
         } // (removeAttrs args (builtins.attrNames (builtins.functionArgs wrapAppImage))));

     

       47
       47
       +
             runScript = "appimage-exec.sh -w ${src}";

     

       48
       48
       +
           } // (removeAttrs args (builtins.attrNames (builtins.functionArgs wrapAppImage))));

     

       33
       49
        
       

     

       34
       34
       -
         wrapType2 = args@{ name, src, extraPkgs ? pkgs: [], ... }: wrapAppImage (args // {

     

       35
       35
       -
           inherit name extraPkgs;

     

       36
       36
       -
           src = extract { inherit name src; };

     

       37
       37
       -
         });

     

       50
       50
       +
         wrapType2 = args@{ name, src, extraPkgs ? pkgs: [ ], ... }: wrapAppImage

     

       51
       51
       +
           (args // {

     

       52
       52
       +
             inherit name extraPkgs;

     

       53
       53
       +
             src = extract { inherit name src; };

     

       54
       54
       +
           });

     

       38
       55
        
       

     

       39
       56
        
         defaultFhsEnvArgs = {

     

       40
       57
        
           name = "appimage-env";