From aa4d9f988073c992414e2f74bb13ea80dd2b07a7 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 7 Nov 2017 22:29:52 -0600
Subject: [PATCH] try to fix appimage generation

---
 appimage.nix     |  2 +-
 appimagetool.nix | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/appimage.nix b/appimage.nix
index b934a6e..49bfe6c 100644
--- a/appimage.nix
+++ b/appimage.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   name = "appimage";
   buildInputs = [ appimagetool ];
   buildCommand = ''
-    appimagetool ${dir}/*.AppDir
+    ARCH=x86_64 appimagetool ${dir}/*.AppDir
     mkdir $out
     cp *.AppImage $out
   '';
diff --git a/appimagetool.nix b/appimagetool.nix
index 4f39000..61eda03 100644
--- a/appimagetool.nix
+++ b/appimagetool.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fuse, zlib, squashfsTools }:
+{ stdenv, fetchurl, fuse, zlib, squashfsTools, glib }:
 
 # This is from some binaries.
 
@@ -31,7 +31,15 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p $out
     cp -r usr/* $out
+
+    patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+         --set-rpath ${stdenv.glibc.out}/lib:${fuse}/lib:${zlib}/lib:${glib}/lib \
+	 $out/bin/appimagetool
+    patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+         --set-rpath ${zlib}/lib \
+	 $out/bin/mksquashfs
   '';
 
+  dontStrip = true;
   dontPatchELF = true;
 }