1b9cffd · nix-bundle · git.iko.soy

appdir.sh+1−1

@@ -13,7 +13,7 @@ fi

13

14target="$1"

15

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; }"

17

18out=$(nix-store --no-gc-warning -r $(nix-instantiate --no-gc-warning -E "$expr"))

19

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

19

20target="$1"

21

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; })"

23

24out=$(nix-store --no-gc-warning -r $(nix-instantiate --no-gc-warning -E "$expr"))

25