public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

appimageTools: use functionArgs as suggested, use dynamicLinker attr

This commit is contained in:
Will Dietz 2019-02-23 18:08:38 -06:00
parent 25fb5d553c
commit 843d5b05ef
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/build-support/appimage/default.nix
View File

@ -23,7 +23,7 @@ rec {
buildCommand = '' buildCommand = ''
install $src ./appimage install $src ./appimage
patchelf \ patchelf \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \
--replace-needed libz.so.1 ${zlib}/lib/libz.so.1 \ --replace-needed libz.so.1 ${zlib}/lib/libz.so.1 \
./appimage ./appimage
@ -46,7 +46,7 @@ rec {
cd $APPDIR cd $APPDIR
exec ./AppRun "$@" exec ./AppRun "$@"
''; '';
} // (builtins.removeAttrs args [ "name" "src" "extraPkgs" ])); } // (removeAttrs args (builtins.attrNames (builtins.functionArgs wrapAppImage))));
wrapType1 = args@{ name, src, extraPkgs ? pkgs: [], ... }: wrapAppImage (args // { wrapType1 = args@{ name, src, extraPkgs ? pkgs: [], ... }: wrapAppImage (args // {
inherit name extraPkgs; inherit name extraPkgs;