565770f..master · nix-bundle

git.iko.soy/nix-bundle

8 files changed+65−37

unifiedsplit

appdir.nix+2−2 appimagetool.nix+2−2 default.nix+23−8 flake.nix+1−1 nix-bootstrap.sh+13−13 nix-bundle.sh+4−1 nix-run.sh+10−10 test.sh+10

appdir.nix+2−2

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

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

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

33let

44 AppRun = targets: muslPkgs.stdenv.mkDerivation {

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

99 buildPhase = ''

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

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

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

1212 '';

1313

1414 installPhase = ''

appimagetool.nix+2−2

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

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

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

33# This is from some binaries.

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

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

3838 patchelf \

3939 --set-interpreter ${dynamicLinker} \

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

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

4141 $x

4242 done

4343 '';

default.nix+23−8

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

1010 '';

1111 });

1212in 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+

1323 arx = { archive, startup}:

1424 stdenv.mkDerivation {

1525 name = "arx";

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

3545 };

3646

3747 # TODO: eventually should this go in nixpkgs?

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

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

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

4050 src = ./nix-user-chroot;

4151

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

7080 };

7181 };

7282

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

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

84+ let

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

86+ path = toStorePath target;

87+ in

7488 writeScript "startup" ''

7589 #!/bin/sh

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

90+ ${initScript}

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

7792 '';

7893

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

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

8095 let

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

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

8297 in makebootstrap {

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

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

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

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

96111 buildInputs = o.buildInputs ++ targets;

97112 makeFlags = o.makeFlags ++ [

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

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

99114 ];

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

101− inherit target extraTargets run;

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

116+ inherit target extraTargets run initScript;

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

103118 };

104119}

flake.nix+1−1

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

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

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

1515 #!/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} "$@"

1717 '';

1818 in nix-bundle.makebootstrap {

1919 targets = [ script ];

nix-bootstrap.sh+13−13

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

11#!/bin/sh

3−cmd=sh

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

5− cmd=$@

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

4+ set -- sh

65fi

87# should download this in the future

98# but the mirror is down

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

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

1110export PROOT_NO_SECCOMP=1

1211

1312nixdir=$HOME/.nix

1413

1514OLD_NIX_PATH=$NIX_PATH

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

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

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

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

1818

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

2020 export IN_PROOT=1

2121

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

23− mkdir -p $nixdir

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

23+ mkdir -p "$nixdir"

2424 s=$(mktemp)

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

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

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

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

2727 fi

2828

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

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

3030

3131 export IN_PROOT=

3232 exit

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

34− exec $cmd

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

34+ exec "$@"

3535fi

nix-bundle.sh+4−1

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

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

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

1010

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

12+store.

13+

1114For example:

1215

1316$ $0 hello /bin/hello

@@ -56,5 +59,5 @@ elif [ -t 1 ]; then

5659 echo "Nix bundle created at $filename."

5760 cp -f "$out" "$filename"

5861else

59− cat "$out"

62+ echo "$out"

6063fi

nix-run.sh+10−10

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

2222shift

2323

2424# A second argument will provide a hint to run

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

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

2626 name="$1"

2727 shift

2828else

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

5353 file="$1"

5454 shift

5555

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

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

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

5858

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

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

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

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

6161 fi

6262

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

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

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

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

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

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

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

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

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

8484 run_darwin_app "$f" "$@"

8585 done

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

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

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

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

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

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

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

9090 run_linux_desktop_app "$f"

9191 done

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

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

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

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

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

9696 run_bin "$bin" "$@"

9797 done

9898else

test.shnew file+10

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

1+#!/usr/bin/env bash

2+set -euo pipefail

3+export NIX_PATH=channel:nixos-20.09

5+echo "Test with attribute name"

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

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