on master help sign in
try to fix appimage generation
aa4d9f9Matthew Bauer
appimage.nix+1−1
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
5 name = "appimage";
5 name = "appimage";
6 buildInputs = [ appimagetool ];
6 buildInputs = [ appimagetool ];
7 buildCommand = ''
7 buildCommand = ''
8− appimagetool ${dir}/*.AppDir
8+ ARCH=x86_64 appimagetool ${dir}/*.AppDir
9 mkdir $out
9 mkdir $out
10 cp *.AppImage $out
10 cp *.AppImage $out
11 '';
11 '';
appimagetool.nix+9−1
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, fuse, zlib, squashfsTools }:
1+{ stdenv, fetchurl, fuse, zlib, squashfsTools, glib }:
2
2
3# This is from some binaries.
3# This is from some binaries.
4
4
@@ -31,7 +31,15 @@ stdenv.mkDerivation rec {
31 installPhase = ''
31 installPhase = ''
32 mkdir -p $out
32 mkdir -p $out
33 cp -r usr/* $out
33 cp -r usr/* $out
34+
35+ patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
36+ --set-rpath ${stdenv.glibc.out}/lib:${fuse}/lib:${zlib}/lib:${glib}/lib \
37+ $out/bin/appimagetool
38+ patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
39+ --set-rpath ${zlib}/lib \
40+ $out/bin/mksquashfs
34 '';
41 '';
35
42
43+ dontStrip = true;
36 dontPatchELF = true;
44 dontPatchELF = true;
37}
45}