master..d623276 · nix-bundle

README.md−6

since splitsnapshots

unifiedsplit

@@ -50,12 +50,6 @@ Or if you want to try graphical applications:

50./nix-bundle.sh firefox /bin/firefox

51```

52

53−```sh

54−# SDL-based game. ~228MB

55−./nix-bundle.sh ivan /bin/ivan

56−```

57−

58−

59## Self-bundling (meta)

53## Self-bundling (meta)

60

54

61Starting with v0.1.3, you can bundle nix-bundle! To do this, just use nix-bundle normally:

55Starting with v0.1.3, you can bundle nix-bundle! To do this, just use nix-bundle normally:

appdir.nix+2−2

@@ -1,4 +1,4 @@

1−{ stdenv, lib, fetchurl, muslPkgs, perl, pathsFromGraph, fetchFromGitHub, coreutils, bash }:

1+{ stdenv, fetchurl, muslPkgs, perl, pathsFromGraph, fetchFromGitHub, coreutils, bash }:

2

3let

4 AppRun = targets: muslPkgs.stdenv.mkDerivation {

@@ -8,7 +8,7 @@ let

8

9 buildPhase = ''

10 CC="$CC -O2 -Wall -Wno-deprecated-declarations -Wno-unused-result -static"

11− $CC ${./AppRun.c} -o AppRun -DENV_PATH='"${lib.makeBinPath targets}"'

11+ $CC ${./AppRun.c} -o AppRun -DENV_PATH='"${stdenv.lib.makeBinPath targets}"'

12 '';

13

14 installPhase = ''

appimagetool.nix+2−2

@@ -1,4 +1,4 @@

1−{ stdenv, lib, fetchurl, fuse, zlib, squashfsTools, glib }:

1+{ stdenv, fetchurl, fuse, zlib, squashfsTools, glib }:

2

3# This is from some binaries.

4

@@ -37,7 +37,7 @@ in stdenv.mkDerivation rec {

37 for x in $out/bin/*; do

38 patchelf \

39 --set-interpreter ${dynamicLinker} \

40− --set-rpath ${lib.makeLibraryPath [ zlib stdenv.glibc.out fuse glib ]} \

40+ --set-rpath ${stdenv.lib.makeLibraryPath [ zlib stdenv.glibc.out fuse glib ]} \

41 $x

42 done

43 '';

default.nix+8−23

@@ -10,16 +10,6 @@ let

10 '';

11 });

12in rec {

13− toStorePath = target:

14− # If a store path has been given but is not a derivation, add the missing context

15− # to it so it will be propagated properly as a build input.

16− if !(lib.isDerivation target) && lib.isStorePath target then

17− let path = toString target; in

18− builtins.appendContext path { "${path}" = { path = true; }; }

19− # Otherwise, add to the store. This takes care of appending the store path

20− # in the context automatically.

21− else "${target}";

22−

23 arx = { archive, startup}:

13 arx = { archive, startup}:

24 stdenv.mkDerivation {

14 stdenv.mkDerivation {

25 name = "arx";

15 name = "arx";

@@ -45,7 +35,7 @@ in rec {

45 };

35 };

46

36

47 # TODO: eventually should this go in nixpkgs?

37 # TODO: eventually should this go in nixpkgs?

48− nix-user-chroot = lib.makeOverridable stdenv.mkDerivation {

38+ nix-user-chroot = stdenv.lib.makeOverridable stdenv.mkDerivation {

49 name = "nix-user-chroot-2c52b5f";

39 name = "nix-user-chroot-2c52b5f";

50 src = ./nix-user-chroot;

40 src = ./nix-user-chroot;

51

41

@@ -80,20 +70,15 @@ in rec {

80 };

70 };

81 };

71 };

82

72

83− makeStartup = { target, nixUserChrootFlags, nix-user-chroot', run, initScript }:

73+ makeStartup = { target, nixUserChrootFlags, nix-user-chroot', run }:

84− let

85− # Avoid re-adding a store path into the store

86− path = toStorePath target;

87− in

88 writeScript "startup" ''

74 writeScript "startup" ''

89 #!/bin/sh

75 #!/bin/sh

90− ${initScript}

91− .${nix-user-chroot'}/bin/nix-user-chroot -n ./nix ${nixUserChrootFlags} -- ${path}${run} "$@"

76+ .${nix-user-chroot'}/bin/nix-user-chroot -n ./nix ${nixUserChrootFlags} -- ${target}${run} $@

92 '';

77 '';

93

78

94− nix-bootstrap = { target, extraTargets ? [], run, nix-user-chroot' ? nix-user-chroot, nixUserChrootFlags ? "", initScript ? "" }:

79+ nix-bootstrap = { target, extraTargets ? [], run, nix-user-chroot' ? nix-user-chroot, nixUserChrootFlags ? "" }:

95 let

80 let

96− script = makeStartup { inherit target nixUserChrootFlags nix-user-chroot' run initScript; };

81+ script = makeStartup { inherit target nixUserChrootFlags nix-user-chroot' run; };

97 in makebootstrap {

82 in makebootstrap {

98 startup = ".${script} '\"$@\"'";

83 startup = ".${script} '\"$@\"'";

99 targets = [ "${script}" ] ++ extraTargets;

84 targets = [ "${script}" ] ++ extraTargets;

@@ -110,10 +95,10 @@ in rec {

110 nix-user-chroot'' = targets: nix-user-chroot.overrideDerivation (o: {

95 nix-user-chroot'' = targets: nix-user-chroot.overrideDerivation (o: {

111 buildInputs = o.buildInputs ++ targets;

96 buildInputs = o.buildInputs ++ targets;

112 makeFlags = o.makeFlags ++ [

97 makeFlags = o.makeFlags ++ [

113− ''ENV_PATH="${lib.makeBinPath targets}"''

98+ ''ENV_PATH="${stdenv.lib.makeBinPath targets}"''

114 ];

99 ];

115− }); in { target, extraTargets ? [], run, initScript ? "" }: nix-bootstrap {

100+ }); in { target, extraTargets ? [], run }: nix-bootstrap {

116− inherit target extraTargets run initScript;

101+ inherit target extraTargets run;

117 nix-user-chroot' = nix-user-chroot'' extraTargets;

102 nix-user-chroot' = nix-user-chroot'' extraTargets;

118 };

103 };

119}

104}

flake.nix+1−1

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

13 nix-bundle = import self { nixpkgs = nixpkgs'; };

14 script = nixpkgs'.writeScript "startup" ''

15 #!/bin/sh

16− .${nix-bundle.nix-user-chroot}/bin/nix-user-chroot -n ./nix -- ${program} "$@"

16+ .${nix-bundle.nix-user-chroot}/bin/nix-user-chroot -n ./nix -- ${program} $@

17 '';

18 in nix-bundle.makebootstrap {

19 targets = [ script ];

nix-bootstrap.sh+13−13

@@ -1,35 +1,35 @@

1#!/bin/sh

2

3+cmd=sh

3−if [ $# -gt 0 ]; then

4+if ! [ $# -eq 0 ]; then

4− set -- sh

5+ cmd=$@

5fi

6fi

6

7

7# should download this in the future

8# should download this in the future

8# but the mirror is down

9# but the mirror is down

9−proot=$(dirname "$0")/proot-$(uname -p)

10+proot=`dirname $0`/proot-`uname -p`

10export PROOT_NO_SECCOMP=1

11export PROOT_NO_SECCOMP=1

11

12

12nixdir=$HOME/.nix

13nixdir=$HOME/.nix

13

14

14OLD_NIX_PATH=$NIX_PATH

15OLD_NIX_PATH=$NIX_PATH

15−# shellcheck disable=SC1090

16−if [ -e "$HOME/.nix-profile/etc/profile.d/nix.sh" ]; then . "$HOME/.nix-profile/etc/profile.d/nix.sh"; fi

16+if [ -e $HOME/.nix-profile/etc/profile.d/nix.sh ]; then . $HOME/.nix-profile/etc/profile.d/nix.sh; fi

17−if [ -n "$OLD_NIX_PATH" ]; then NIX_PATH="$OLD_NIX_PATH"; fi

17+if ! [ -z "$OLD_NIX_PATH" ]; then NIX_PATH="$OLD_NIX_PATH"; fi

18

19if [ -z "$IN_PROOT" ]; then

20 export IN_PROOT=1

21

22− if ! [ -d "$nixdir" ]; then

22+ if ! [ -d $nixdir ]; then

23− mkdir -p "$nixdir"

23+ mkdir -p $nixdir

24 s=$(mktemp)

25− curl https://nixos.org/nix/install -o "$s"

25+ curl https://nixos.org/nix/install -o $s

26− $proot -b "$nixdir:/nix" "$0" sh "$s"

26+ $proot -b $nixdir:/nix $0 sh $s

27 fi

28

29− $proot -b "$nixdir:/nix" "$0" "$@"

29+ $proot -b $nixdir:/nix $0 $cmd

30

31 export IN_PROOT=

32 exit

33−elif [ $# -gt 0 ]; then

33+elif ! [ $# -eq 0 ]; then

34− exec "$@"

34+ exec $cmd

35fi

nix-bundle.sh+6−11

@@ -8,9 +8,6 @@ Usage: $0 TARGET EXECUTABLE

8Create a single-file bundle from the nixpkgs attribute "TARGET".

9EXECUTABLE should be relative to the TARGET's output path.

10

11−The TARGET is either an attribute in nixpkgs, or an absolute path to the

12−store.

13−

14For example:

11For example:

15

12

16$ $0 hello /bin/hello

13$ $0 hello /bin/hello

@@ -22,7 +19,7 @@ EOF

22 exit 1

19 exit 1

23fi

20fi

24

21

25−nix_file=$(dirname "$0")/default.nix

22+nix_file=`dirname $0`/default.nix

26

23

27target="$1"

24target="$1"

28shift

25shift

@@ -41,23 +38,21 @@ shift

41bootstrap=nix-bootstrap

38bootstrap=nix-bootstrap

42if [ "$target" = "nix-bundle" ] || [ "$target" = "nixStable" ] || [ "$target" = "nixUnstable" ] || [ "$target" = "nix" ]; then

39if [ "$target" = "nix-bundle" ] || [ "$target" = "nixStable" ] || [ "$target" = "nixUnstable" ] || [ "$target" = "nix" ]; then

43 bootstrap=nix-bootstrap-nix

40 bootstrap=nix-bootstrap-nix

44−elif [ -n "$extraTargets" ]; then

41+elif ! [ -z "$extraTargets" ]; then

45 bootstrap=nix-bootstrap-path

42 bootstrap=nix-bootstrap-path

46fi

43fi

47

44

48expr="with import <nixpkgs> {}; with import $nix_file {}; $bootstrap { target = $target; extraTargets = [ $extraTargets ]; run = \"$exec\"; }"

45expr="with import <nixpkgs> {}; with import $nix_file {}; $bootstrap { target = $target; extraTargets = [ $extraTargets ]; run = \"$exec\"; }"

49

46

50−drv=$(nix-instantiate --no-gc-warning -E "$expr")

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

51−

52−out=$(nix-store --no-gc-warning --realize "$drv")

53

48

54if [ -z "$out" ]; then

49if [ -z "$out" ]; then

55 >&2 echo "$0 failed. Exiting."

50 >&2 echo "$0 failed. Exiting."

56 exit 1

51 exit 1

57elif [ -t 1 ]; then

52elif [ -t 1 ]; then

58− filename=$(basename "$exec")

53+ filename=$(basename $exec)

59 echo "Nix bundle created at $filename."

54 echo "Nix bundle created at $filename."

60− cp -f "$out" "$filename"

55+ cp -f $out $filename

61else

56else

62− echo "$out"

57+ cat $out

63fi

58fi

nix-run.sh+10−10

@@ -22,7 +22,7 @@ pkg="$1"

22shift

23

24# A second argument will provide a hint to run

25−if [ -n "$1" ]; then

25+if ! [ -z "$1" ]; then

26 name="$1"

27 shift

28else

@@ -53,11 +53,11 @@ run_linux_desktop_app () {

53 file="$1"

54 shift

55

56− cmd=$(grep '^Exec' "$file" | tail -1 | \

56+ cmd=$(grep '^Exec' $file | tail -1 | \

57 sed 's/Exec=//;s/^"//;s/" *$//')

58

59− if [ "$#" -gt 0 ]; then

59+ if ! [ -z "$@" ]; then

60− cmd=$(echo "$cmd" | sed "s/%[fu]/$1/;s/%[FU]/$*/")

60+ cmd=$(echo "$cmd" | sed "s/%[fu]/$1/;s/%[FU]/$@/")

61 fi

62

63 cmd=$(echo "$cmd" | sed "s/%k/$desktop/;s/%.//")

@@ -79,20 +79,20 @@ elif [ -x "$out/bin/run" ]; then

79 run_bin "$out/bin/run" "$@"

80elif [ "$(uname)" = Darwin ] && [ -d "$out/Applications/$name.app" ]; then

81 run_darwin_app "$out/Applications/$name.app" "$@"

82−elif [ "$(uname)" = Darwin ] && [ -d "$out"/Applications/*.app ]; then

82+elif [ "$(uname)" = Darwin ] && [ -d $out/Applications/*.app ]; then

83− for f in "$out"/Applications/*.app; do

83+ for f in $out/Applications/*.app; do

84 run_darwin_app "$f" "$@"

85 done

86elif [ -f "$out/share/applications/$name.desktop" ]; then

87− run_linux_desktop_app "$out/share/applications/$name.desktop" "$@"

87+ run_linux_desktop_app "$out/share/applications/$name.desktop" $@

88−elif [ -d "$out"/share/applications ]; then

88+elif [ -d $out/share/applications ]; then

89− for f in "$out"/share/applications/*.desktop; do

89+ for f in $out/share/applications/*.desktop; do

90 run_linux_desktop_app "$f"

91 done

92elif [ -x "$out/bin/$name" ]; then

93 run_bin "$out/bin/$name" "$@"

94elif [ -d "$out/bin" ]; then

95− for bin in "$out"/bin/*; do

95+ for bin in $out/bin/*; do

96 run_bin "$bin" "$@"

97 done

98else

test.shdeleted−10

@@ -1,10 +0,0 @@

1−#!/usr/bin/env bash

2−set -euo pipefail

3−export NIX_PATH=channel:nixos-20.09

4−

5−echo "Test with attribute name"

6−./nix-bundle.sh hello /bin/hello

7−

8−echo "Test with store path"

9−out=$(nix-build --no-out-link --expr '(import <nixpkgs> {})' -A hello)

10−./nix-bundle.sh "$out" /bin/hello