on master help sign in
Fix appimage stuff

Wasn't working since v0.1.1

commit1b9cffd972084047a5271ce0332ee95a186bd71b authorMatthew Bauer <mjbauer95@gmail.com> dateSun 30 Apr 2017, 02:32 (9 years ago) parent505248d
3 files changed+15−2
appdir.sh+1−1 appimage-top.nix+13 nix2appimage.sh+1−1
appdir.sh+1−1
@@ -13,7 +13,7 @@ fi
1313
1414target="$1"
1515
16−expr="with import <nixpkgs> {}; with import ./. {}; appdir { name = \"$target\"; target = $target; }"
16+expr="with import <nixpkgs> {}; with import ./appimage-top.nix {}; appdir { name = \"$target\"; target = $target; }"
1717
1818out=$(nix-store --no-gc-warning -r $(nix-instantiate --no-gc-warning -E "$expr"))
1919
appimage-top.nixnew file+13
@@ -0,0 +1,13 @@
1+{nixpkgs ? import <nixpkgs> {}}:
2+
3+with nixpkgs;
4+
5+rec {
6+ appimagetool = callPackage ./appimagetool.nix {};
7+
8+ appimage = callPackage ./appimage.nix {
9+ inherit appimagetool;
10+ };
11+
12+ appdir = callPackage ./appdir.nix {};
13+}
nix2appimage.sh+1−1
@@ -19,7 +19,7 @@ fi
1919
2020target="$1"
2121
22−expr="with import <nixpkgs> {}; with import ./. {}; appimage (appdir { name = \"$target\"; target = $target; })"
22+expr="with import <nixpkgs> {}; with import ./appimage-top.nix {}; appimage (appdir { name = \"$target\"; target = $target; })"
2323
2424out=$(nix-store --no-gc-warning -r $(nix-instantiate --no-gc-warning -E "$expr"))
2525