on master help sign in
18 files changed+589−101
since splitsnapshots
unifiedsplit
AppRun.c+10−2 Makefile+2−2 README.md+20−6 appdir.nix+6−6 appimage-bundle.nix+61 appimage-top.nix+10−6 appimage.nix+1−1 appimagetool.nix+15−5 default.nix+54−31 flake.nix+26 nix-bootstrap.sh+13−13 nix-bundle.sh+12−7 nix-run.sh+23−21 nix-user-chroot/Makefile+4 nix-user-chroot/main.cpp+307 release.nix+1−1 test-appimage.nix+14 test.sh+10
AppRun.c+10−2
@@ -92,7 +92,7 @@ static void add_path(const char* name, const char* rootdir) {
9292}
9393
9494#define SAVE_ENV_VAR(x) char *x = getenv(#x)
95−#define LOAD_ENV_VAR(x) setenv(#x, x, 1)
95+#define LOAD_ENV_VAR(x) do { if (x != NULL) setenv(#x, x, 1); } while(0)
9696
9797int main(int argc, char *argv[]) {
9898 char *appdir = dirname(realpath("/proc/self/exe", NULL));
@@ -207,6 +207,11 @@ int main(int argc, char *argv[]) {
207207 err_exit("mount(%s, %s)", usrdir, path_buf);
208208 }
209209
210+ snprintf(path_buf, sizeof(path_buf), "%s/bin", rootdir);
211+ if (symlink("/usr/bin", path_buf) < 0) {
212+ err_exit("symlink(/usr/bin, %s)", path_buf);
213+ }
214+
210215 // fixes issue #1 where writing to /proc/self/gid_map fails
211216 // see user_namespaces(7) for more documentation
212217 int fd_setgroups = open("/proc/self/setgroups", O_WRONLY);
@@ -226,8 +231,10 @@ int main(int argc, char *argv[]) {
226231 err_exit("chroot(%s)", rootdir);
227232 }
228233
229− chdir("/");
234+ char *pwddir = getenv("PWD");
235+ chdir(pwddir);
230236
237+ SAVE_ENV_VAR(PWD);
231238 SAVE_ENV_VAR(DBUS_SESSION_BUS_ADDRESS);
232239 SAVE_ENV_VAR(USER);
233240 SAVE_ENV_VAR(HOSTNAME);
@@ -243,6 +250,7 @@ int main(int argc, char *argv[]) {
243250
244251 clearenv();
245252
253+ LOAD_ENV_VAR(PWD);
246254 LOAD_ENV_VAR(DBUS_SESSION_BUS_ADDRESS);
247255 LOAD_ENV_VAR(USER);
248256 LOAD_ENV_VAR(HOSTNAME);
Makefile+2−2
@@ -1,5 +1,5 @@
11PREFIX ?= /usr
22
3−install: nix-bundle.sh nix-run.sh appdir.nix appimagetool.nix appimage.nix AppRun.c appimage-top.nix default.nix appdir.sh nix2appimage.sh
3+install: nix-bundle.sh nix-run.sh appdir.nix appimagetool.nix appimage.nix AppRun.c appimage-top.nix default.nix appdir.sh nix2appimage.sh nix-user-chroot/
44 mkdir -p ${PREFIX}/share/nix-bundle/
5− install $^ ${PREFIX}/share/nix-bundle/
5+ cp -r $^ ${PREFIX}/share/nix-bundle/
README.md+20−6
@@ -8,7 +8,6 @@ nix-bundle is a way to package Nix attributes into single-file executables.
88* Can be run by non-root users
99* No runtime
1010* Distro agnostic
11−* Completely portable
1211* No installation
1312
1413## Getting started
@@ -28,7 +27,7 @@ $ ./hello
2827Hello, world!
2928```
3029
31−This is a standalone file that is completely portable! As long as you are running a same architecture Linux kernel and have a shell interpreter it will run. No external dependencies are required besides a compatible Linux kernel and a shell interpreter.
30+This is a standalone file that is completely portable! As long as you are running the same architecture Linux kernel and have a shell interpreter available it will run.
3231
3332Some others to try:
3433
@@ -36,17 +35,30 @@ Some others to try:
3635./nix-bundle.sh nano /bin/nano
3736```
3837
38+```sh
39+./nix-bundle.sh emacs /bin/emacs
40+```
41+
42+Or if you want to try graphical applications:
43+
44+```sh
45+# Simple X game. Very few dependencies. Quick to build and load. ~13MB
46+./nix-bundle.sh xskat /bin/xskat
47+```
48+
3949```sh
4050./nix-bundle.sh firefox /bin/firefox
4151```
4252
4353```sh
44−./nix-bundle.sh emacs /bin/emacs
54+# SDL-based game. ~228MB
55+./nix-bundle.sh ivan /bin/ivan
4556```
4657
47−## Self-bundling
4858
49−Startin with v0.1.3, you can bundle nix-bundle! To do this, just use nix-bundle normally:
59+## Self-bundling (meta)
60+
61+Starting with v0.1.3, you can bundle nix-bundle! To do this, just use nix-bundle normally:
5062
5163```sh
5264NIX_PATH="nixpkgs=https://github.com/matthewbauer/nixpkgs/archive/nix-bundle.tar.gz" ./nix-bundle.sh nix-bundle /bin/nix-bundle
@@ -54,7 +66,7 @@ NIX_PATH="nixpkgs=https://github.com/matthewbauer/nixpkgs/archive/nix-bundle.tar
5466
5567## [Experimental] Create AppImage executables from Nix expressions
5668
57−"nix-bundle.sh" tends to create fairly large outputs. This is largely because nix-bundle.sh uses gzip compression and AppImage uses lzma compression. Anyway, you can create a compliant "AppImage" using the "nix2appimage.sh" script:
69+"nix-bundle.sh" tends to create fairly large outputs. This is largely because nix-bundle.sh "extracts" its payload up front. AppImage uses a different method where extraction only takes place when the file is accessed (through FUSE and SquashFS). You can now create a compliant "AppImage" using the "nix2appimage.sh" script:
5870
5971```sh
6072./nix2appimage.sh emacs
@@ -84,6 +96,8 @@ Some other examples to try:
8496
8597These may take a while because of the large closure size.
8698
99+Note that these do not currently work out of the box with NixOS. Other Linux distros should work.
100+
87101## Comparison with AppImage, FlatPak, Snappy
88102
89103| Name | Distro-agnostic | Runtime required | Root required | Storage |
appdir.nix+6−6
@@ -1,14 +1,14 @@
1−{ stdenv, fetchurl, perl, pathsFromGraph, fetchFromGitHub, musl, coreutils, bash }:
1+{ stdenv, lib, fetchurl, muslPkgs, perl, pathsFromGraph, fetchFromGitHub, coreutils, bash }:
22
33let
4− AppRun = targets: stdenv.mkDerivation {
4+ AppRun = targets: muslPkgs.stdenv.mkDerivation {
55 name = "AppRun";
66
77 phases = [ "buildPhase" "installPhase" "fixupPhase" ];
88
99 buildPhase = ''
10− CC="${musl}/bin/musl-gcc -O2 -Wall -Wno-deprecated-declarations -Wno-unused-result -static"
11− $CC ${./AppRun.c} -o AppRun -DENV_PATH='"${stdenv.lib.makeBinPath targets}"'
10+ CC="$CC -O2 -Wall -Wno-deprecated-declarations -Wno-unused-result -static"
11+ $CC ${./AppRun.c} -o AppRun -DENV_PATH='"${lib.makeBinPath targets}"'
1212 '';
1313
1414 installPhase = ''
@@ -63,12 +63,12 @@ in
6363
6464 # icons
6565 if [ -d ${target}/share/icons ]; then
66− icon=$(find ${target}/share/icons -name "${name}.png" | head -n1)
66+ icon=$(find ${target}/share/icons -name "${name}*.png" | head -n1)
6767 if ! [ -z "$icon" ]; then
6868 ln -s .$icon
6969 ln -s .$icon .DirIcon
7070 else
71− icon=$(find ${target}/share/icons -name "${name}.svg" | head -n1)
71+ icon=$(find ${target}/share/icons -name "${name}*.svg" | head -n1)
7272 if ! [ -z "$icon" ]; then
7373 ln -s .$icon
7474 ln -s .$icon .DirIcon
appimage-bundle.nixnew file+61
@@ -0,0 +1,61 @@
1+# use like this:
2+# nix-build appimage-bundle.nix --argstr package hello --argstr exec hello
3+# nix-build appimage-bundle.nix --arg package 'with import <nixpkgs>{}; writers.writePython3Bin "helloThere.py" {} "print(1)\n"' --argstr exec helloThere.py
4+
5+
6+{nixpkgs ? import <nixpkgs>{},
7+package,
8+exec,
9+... }:
10+let
11+ appimage_src = drv : exec : with nixpkgs;
12+ self.stdenv.mkDerivation rec {
13+ name = drv.name + "-appdir";
14+ env = buildEnv {
15+ inherit name;
16+ paths = buildInputs;
17+ };
18+ src = env;
19+ inherit exec;
20+ buildInputs = [ drv ];
21+ buildCommand = ''
22+ mkdir -p $out/share/icons/hicolor/256x256/apps
23+ mkdir -p $out/share/applications
24+
25+ shopt -s extglob
26+ ln -s ${env}/!(share) $out/
27+ ln -s ${env}/share/* $out/share/
28+
29+ touch $out/share/icons/hicolor/256x256/apps/${drv.name}.png
30+ touch $out/share/icons/${drv.name}.png
31+
32+ cat <<EOF > $out/share/applications/${drv.name}.desktop
33+ [Desktop Entry]
34+ Type=Application
35+ Version=1.0
36+ Name=${drv.name}
37+ Path=${env}
38+ Icon=${drv.name}
39+ Exec=$exec
40+ Terminal=true
41+ EOF
42+ '';
43+ system = builtins.currentSystem;
44+ };
45+
46+in
47+ let results =
48+ if (nixpkgs.lib.isDerivation package && !(nixpkgs.lib.isString package))
49+ then {
50+ name = package.name;
51+ target = appimage_src package "${exec}";
52+ extraTargets = [];
53+ }
54+ else {
55+ name = nixpkgs."${package}".name;
56+ target = appimage_src (nixpkgs."${package}") "${exec}";
57+ extraTargets = [];
58+ };
59+ in
60+ with (import (./appimage-top.nix){nixpkgs' = nixpkgs.path;});
61+ (appimage (appdir results )).overrideAttrs (old: {name = results.name;})
appimage-top.nix+10−6
@@ -1,13 +1,17 @@
1−{nixpkgs ? import <nixpkgs> {}}:
1+{ nixpkgs' ? <nixpkgs> }:
22
3−with nixpkgs;
3+let
4+ pkgs = import nixpkgs' { };
5+ muslPkgs = import nixpkgs' {
6+ localSystem.config = "x86_64-unknown-linux-musl";
7+ };
48
5−rec {
6− appimagetool = callPackage ./appimagetool.nix {};
9+in rec {
10+ appimagetool = pkgs.callPackage ./appimagetool.nix {};
711
8− appimage = callPackage ./appimage.nix {
12+ appimage = pkgs.callPackage ./appimage.nix {
913 inherit appimagetool;
1014 };
1115
12− appdir = callPackage ./appdir.nix {};
16+ appdir = pkgs.callPackage ./appdir.nix { inherit muslPkgs; };
1317}
appimage.nix+1−1
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
55 name = "appimage";
66 buildInputs = [ appimagetool ];
77 buildCommand = ''
8− appimagetool ${dir}/*.AppDir
8+ ARCH=x86_64 appimagetool ${dir}/*.AppDir
99 mkdir $out
1010 cp *.AppImage $out
1111 '';
appimagetool.nix+15−5
@@ -1,16 +1,18 @@
1−{ stdenv, fetchurl, fuse, zlib, squashfsTools }:
1+{ stdenv, lib, fetchurl, fuse, zlib, squashfsTools, glib }:
22
33# This is from some binaries.
44
55# Ideally, this should be source based,
66# but I can't get it to build from GitHub
77
8−stdenv.mkDerivation rec {
8+let
9+ inherit (stdenv.cc.bintools) dynamicLinker;
10+in stdenv.mkDerivation rec {
911 name = "appimagekit";
1012
1113 src = fetchurl {
12− url = "https://github.com/probonopd/AppImageKit/releases/download/7/appimagetool-x86_64.AppImage";
13− sha256 = "1irvbf0xnya16cyzpvr43jviq5ly3wl7b9753rji7d1hhxwb7b9r";
14+ url = "https://github.com/AppImage/AppImageKit/releases/download/10/appimagetool-x86_64.AppImage";
15+ sha256 = "03zbiblj8a1yk1xsb5snxi4ckwn3diyldg1jh5hdjjhsmpw652ig";
1416 };
1517
1618 buildInputs = [
@@ -22,7 +24,7 @@ stdenv.mkDerivation rec {
2224 unpackPhase = ''
2325 cp $src appimagetool-x86_64.AppImage
2426 chmod u+wx appimagetool-x86_64.AppImage
25− patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
27+ patchelf --set-interpreter ${dynamicLinker} \
2628 --set-rpath ${fuse}/lib:${zlib}/lib \
2729 appimagetool-x86_64.AppImage
2830 ./appimagetool-x86_64.AppImage --appimage-extract
@@ -31,7 +33,15 @@ stdenv.mkDerivation rec {
3133 installPhase = ''
3234 mkdir -p $out
3335 cp -r usr/* $out
36+
37+ for x in $out/bin/*; do
38+ patchelf \
39+ --set-interpreter ${dynamicLinker} \
40+ --set-rpath ${lib.makeLibraryPath [ zlib stdenv.glibc.out fuse glib ]} \
41+ $x
42+ done
3443 '';
3544
45+ dontStrip = true;
3646 dontPatchELF = true;
3747}
default.nix+54−31
@@ -2,12 +2,29 @@
22
33with nixpkgs;
44
5−rec {
5+let
6+ arx' = haskellPackages.arx.overrideAttrs (o: {
7+ patchPhase = (o.patchPhase or "") + ''
8+ substituteInPlace model-scripts/tmpx.sh \
9+ --replace /tmp/ \$HOME/.cache/
10+ '';
11+ });
12+in 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+
623 arx = { archive, startup}:
724 stdenv.mkDerivation {
825 name = "arx";
926 buildCommand = ''
10− ${haskellPackages.arx}/bin/arx tmpx ${archive} -rm! -o $out // ${startup}
27+ ${arx'}/bin/arx tmpx --shared -rm! ${archive} -o $out // ${startup}
1128 chmod +x $out
1229 '';
1330 };
@@ -28,14 +45,11 @@ rec {
2845 };
2946
3047 # TODO: eventually should this go in nixpkgs?
31− nix-user-chroot = stdenv.lib.makeOverridable stdenv.mkDerivation {
32− name = "nix-user-chroot-2b144e";
33− src = fetchFromGitHub {
34− owner = "matthewbauer";
35− repo = "nix-user-chroot";
36− rev = "b0c8f81f85487b0f9eb8ed8e6d33445423bfb3e4";
37− sha256 = "1x15jxdx9kka1nx3nmz6xkjfyb9mj3i02bhwy0zhj8z2hi1kyc9l";
38− };
48+ nix-user-chroot = lib.makeOverridable stdenv.mkDerivation {
49+ name = "nix-user-chroot-2c52b5f";
50+ src = ./nix-user-chroot;
51+
52+ makeFlags = [];
3953
4054 # hack to use when /nix/store is not available
4155 postFixup = ''
@@ -54,6 +68,8 @@ rec {
5468
5569 runHook postInstall
5670 '';
71+
72+ meta.platforms = lib.platforms.linux;
5773 };
5874
5975 makebootstrap = { targets, startup }:
@@ -64,33 +80,40 @@ rec {
6480 };
6581 };
6682
67− nix-bootstrap = { target, extraTargets ? [], run, nix-user-chroot' ? nix-user-chroot }:
68− makebootstrap {
69− startup = ''.${nix-user-chroot'}/bin/nix-user-chroot ./nix ${target}${run} \$@'';
70− targets = [ nix-user-chroot' target ] ++ extraTargets;
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
88+ writeScript "startup" ''
89+ #!/bin/sh
90+ ${initScript}
91+ .${nix-user-chroot'}/bin/nix-user-chroot -n ./nix ${nixUserChrootFlags} -- ${path}${run} "$@"
92+ '';
93+
94+ nix-bootstrap = { target, extraTargets ? [], run, nix-user-chroot' ? nix-user-chroot, nixUserChrootFlags ? "", initScript ? "" }:
95+ let
96+ script = makeStartup { inherit target nixUserChrootFlags nix-user-chroot' run initScript; };
97+ in makebootstrap {
98+ startup = ".${script} '\"$@\"'";
99+ targets = [ "${script}" ] ++ extraTargets;
71100 };
72101
73− # special case handling because of impurities in nix bootstrap
74− # anything that needs Nix will have to have these setup before they can be run
75− nix-bootstrap-nix = let
76− nix-user-chroot' = nix-user-chroot.override {
77− buildInputs = [ cacert gnutar bzip2 gzip coreutils ];
78− makeFlags = [
79− ''NIX_SSL_CERT_FILE="${cacert}/etc/ssl/certs/ca-bundle.crt"''
80− ''NIX_PATH="nixpkgs=https://github.com/matthewbauer/nixpkgs/archive/nix-bundle.tar.gz"''
81− ''ENV_PATH="${stdenv.lib.makeBinPath [ coreutils gnutar bzip2 gzip bash ]}"''
82− ];
83− }; in { target, extraTargets ? [], run }: nix-bootstrap { inherit target extraTargets run nix-user-chroot'; };
102+ nix-bootstrap-nix = {target, run, extraTargets ? []}:
103+ nix-bootstrap-path {
104+ inherit target run;
105+ extraTargets = [ gnutar bzip2 xz gzip coreutils bash ];
106+ };
84107
85108 # special case adding path to the environment before launch
86109 nix-bootstrap-path = let
87− nix-user-chroot'' = targets: nix-user-chroot.override {
88− buildInputs = targets;
89− makeFlags = [
90− ''ENV_PATH="${stdenv.lib.makeBinPath targets}"''
110+ nix-user-chroot'' = targets: nix-user-chroot.overrideDerivation (o: {
111+ buildInputs = o.buildInputs ++ targets;
112+ makeFlags = o.makeFlags ++ [
113+ ''ENV_PATH="${lib.makeBinPath targets}"''
91114 ];
92− }; in { target, extraTargets ? [], run }: nix-bootstrap {
93− inherit target extraTargets run;
115+ }); in { target, extraTargets ? [], run, initScript ? "" }: nix-bootstrap {
116+ inherit target extraTargets run initScript;
94117 nix-user-chroot' = nix-user-chroot'' extraTargets;
95118 };
96119}
flake.nixnew file+26
@@ -0,0 +1,26 @@
1+{
2+ description = "The purely functional package manager";
3+
4+ inputs.nixpkgs.url = "nixpkgs/nixos-20.03-small";
5+
6+ outputs = { self, nixpkgs }: let
7+ systems = [ "x86_64-linux" "i686-linux" "aarch64-linux" ];
8+ forAllSystems = f: nixpkgs.lib.genAttrs systems (system: f system);
9+ in {
10+ bundlers = {
11+ nix-bundle = { program, system }: let
12+ nixpkgs' = nixpkgs.legacyPackages.${system};
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} "$@"
17+ '';
18+ in nix-bundle.makebootstrap {
19+ targets = [ script ];
20+ startup = ".${builtins.unsafeDiscardStringContext script} '\"$@\"'";
21+ };
22+ };
23+
24+ defaultBundler = self.bundlers.nix-bundle;
25+ };
26+}
nix-bootstrap.sh+13−13
@@ -1,35 +1,35 @@
11#!/bin/sh
22
3−cmd=sh
4−if ! [ $# -eq 0 ]; then
5− cmd=$@
3+if [ $# -gt 0 ]; then
4+ set -- sh
65fi
76
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+12−7
@@ -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
@@ -19,7 +22,7 @@ EOF
1922 exit 1
2023fi
2124
22−nix_file=`dirname $0`/default.nix
25+nix_file=$(dirname "$0")/default.nix
2326
2427target="$1"
2528shift
@@ -36,23 +39,25 @@ exec="$1"
3639shift
3740
3841bootstrap=nix-bootstrap
39−if [ "$target" = "nix-bundle" ] || [ "$target" = "nixStable" ] || [ "$target" = "nixUnstable" ]; then
42+if [ "$target" = "nix-bundle" ] || [ "$target" = "nixStable" ] || [ "$target" = "nixUnstable" ] || [ "$target" = "nix" ]; then
4043 bootstrap=nix-bootstrap-nix
41−elif ! [ -z "$extraTargets" ]; then
44+elif [ -n "$extraTargets" ]; then
4245 bootstrap=nix-bootstrap-path
4346fi
4447
4548expr="with import <nixpkgs> {}; with import $nix_file {}; $bootstrap { target = $target; extraTargets = [ $extraTargets ]; run = \"$exec\"; }"
4649
47−out=$(nix-store --no-gc-warning -r $(nix-instantiate --no-gc-warning -E "$expr"))
50+drv=$(nix-instantiate --no-gc-warning -E "$expr")
51+
52+out=$(nix-store --no-gc-warning --realize "$drv")
4853
4954if [ -z "$out" ]; then
5055 >&2 echo "$0 failed. Exiting."
5156 exit 1
5257elif [ -t 1 ]; then
53− filename=$(basename $exec)
58+ filename=$(basename "$exec")
5459 echo "Nix bundle created at $filename."
55− cp -f $out $filename
60+ cp -f "$out" "$filename"
5661else
57− cat $out
62+ echo "$out"
5863fi
nix-run.sh+23−21
@@ -18,11 +18,11 @@ if [ -z "$1" ]; then
1818 exit 1
1919fi
2020
21−pkg=$1
21+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
@@ -31,7 +31,7 @@ fi
3131
3232expr="with import <nixpkgs> {}; let x = ($pkg); in x"
3333path=$(nix-instantiate --no-gc-warning -E "$expr")
34−out=$(nix-store --no-gc-warning -r $path)
34+out=$(nix-store --no-gc-warning -r "$path")
3535
3636if [ -z "$out" ]; then
3737 >&2 echo "Could not evaluate $pkg to a Nix drv."
@@ -43,7 +43,7 @@ run_darwin_app () {
4343 dir="$1"
4444 shift
4545
46− open -a "$dir" --args $@
46+ open -a "$dir" --args "$@"
4747}
4848
4949# Run FILE as a Freedesktop application
@@ -53,14 +53,16 @@ run_linux_desktop_app () {
5353 file="$1"
5454 shift
5555
56− cmd=$(grep '^Exec' $file | tail -1 | \
57− sed 's/Exec=//;s/^"//;s/" *$/')
56+ cmd=$(grep '^Exec' "$file" | tail -1 | \
57+ 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/%.//")
64+
65+ "$cmd" "$@"
6466}
6567
6668# Run FILE as an ordinary binary
@@ -68,30 +70,30 @@ run_bin () {
6870 file="$1"
6971 shift
7072
71− $file $@
73+ "$file" "$@"
7274}
7375
7476if [ -x "$out/nix-support/run" ]; then
75− run_bin "$out/nix-support/run" $@
77+ run_bin "$out/nix-support/run" "$@"
7678elif [ -x "$out/bin/run" ]; then
77− run_bin "$out/bin/run" $@
79+ run_bin "$out/bin/run" "$@"
7880elif [ "$(uname)" = Darwin ] && [ -d "$out/Applications/$name.app" ]; then
79− run_darwin_app "$out/Applications/$name.app" $@
80−elif [ "$(uname)" = Darwin ] && [ -d $out/Applications/*.app ]; then
81− for f in $out/Applications/*.app; do
82− run_darwin_app "$f" $@
81+ run_darwin_app "$out/Applications/$name.app" "$@"
82+elif [ "$(uname)" = Darwin ] && [ -d "$out"/Applications/*.app ]; then
83+ for f in "$out"/Applications/*.app; do
84+ run_darwin_app "$f" "$@"
8385 done
8486elif [ -f "$out/share/applications/$name.desktop" ]; then
85− run_linux_desktop_app "$out/share/applications/$name.desktop" $@
86−elif [ -d $out/share/applications ]; then
87− 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
8890 run_linux_desktop_app "$f"
8991 done
9092elif [ -x "$out/bin/$name" ]; then
91− run_bin "$out/bin/$name" $@
93+ run_bin "$out/bin/$name" "$@"
9294elif [ -d "$out/bin" ]; then
93− for bin in $out/bin/*; do
94− run_bin "$bin" $@
95+ for bin in "$out"/bin/*; do
96+ run_bin "$bin" "$@"
9597 done
9698else
9799 >&2 echo "Cannot find a way to run path $out."
nix-user-chroot/Makefilenew file+4
@@ -0,0 +1,4 @@
1+ENV_PATH ?= ""
2+
3+nix-user-chroot: main.cpp
4+ g++ -o nix-user-chroot -DENV_PATH='$(ENV_PATH)' main.cpp
nix-user-chroot/main.cppnew file+307
@@ -0,0 +1,307 @@
1+/*
2+ * This file is based on @lethalman's nix-user-chroot. This file has
3+ * diverged from it though.
4+ *
5+ * Usage: nix-user-chroot <nixpath> <command>
6+ */
7+
8+#include <sched.h>
9+#include <unistd.h>
10+#include <stdlib.h>
11+#include <sys/wait.h>
12+#include <signal.h>
13+#include <fcntl.h>
14+#include <stdio.h>
15+#include <string.h>
16+#include <limits.h>
17+#include <errno.h>
18+#include <sys/mount.h>
19+#include <sys/types.h>
20+#include <dirent.h>
21+#include <sys/stat.h>
22+#include <stdint.h>
23+#include <list>
24+#include <string>
25+
26+using namespace std;
27+
28+#define err_exit(format, ...) { fprintf(stderr, format ": %s\n", ##__VA_ARGS__, strerror(errno)); exit(EXIT_FAILURE); }
29+static int child_proc(const char *rootdir, const char *nixdir, uint8_t clear_env, list<struct DirMapping> dirMappings, list<struct SetEnv> envMappings, const char *executable, char * const new_argv[]);
30+
31+volatile uint8_t child_died = 0;
32+int child_pid = 0;
33+
34+static void usage(const char *pname) {
35+ fprintf(stderr, "Usage: %s -n <nixpath> -- <command>\n", pname);
36+ fprintf(stderr, "\t-c\tclear all env vars\n");
37+ fprintf(stderr, "\t-m <src>:<src>\tmap src on the host to dest in the sandbox\n");
38+ fprintf(stderr, "\t-d\tdelete all default dir mappings, may break things\n");
39+ fprintf(stderr, "\t-p <var>\tpreserve the value of a variable across the -c clear\n");
40+ fprintf(stderr, "\t-e\tadd an /escape-hatch to the sandbox, and run (outside the sandbox) any strings written to it\n");
41+
42+ exit(EXIT_FAILURE);
43+}
44+
45+static void update_map(const char *mapping, const char *map_file) {
46+ int fd;
47+
48+ fd = open(map_file, O_WRONLY);
49+ if (fd < 0) {
50+ err_exit("map open");
51+ }
52+
53+ int map_len = strlen(mapping);
54+ if (write(fd, mapping, map_len) != map_len) {
55+ err_exit("map write");
56+ }
57+
58+ close(fd);
59+}
60+
61+static void add_path(string src, string dest, string rootdir) {
62+ string path_buf2;
63+
64+ struct stat statbuf;
65+ if (stat(src.c_str(), &statbuf) < 0) {
66+ fprintf(stderr, "Cannot stat %s: %s\n", src.c_str(), strerror(errno));
67+ return;
68+ }
69+
70+ path_buf2 = rootdir + "/" + dest;
71+
72+ if (S_ISDIR(statbuf.st_mode)) {
73+ mkdir(path_buf2.c_str(), statbuf.st_mode & ~S_IFMT);
74+ if (mount(src.c_str(), path_buf2.c_str(), "none", MS_BIND | MS_REC, NULL) < 0) {
75+ fprintf(stderr, "Cannot bind mount %s to %s: %s\n", src.c_str(), path_buf2.c_str(), strerror(errno));
76+ }
77+ } else if (S_ISREG(statbuf.st_mode)) {
78+ printf("bind-mounting file %s not supported", src.c_str());
79+ }
80+}
81+
82+struct DirMapping {
83+ string src;
84+ string dest;
85+};
86+
87+struct SetEnv {
88+ string key;
89+ string value;
90+};
91+
92+struct DirMapping parseMapping(string input) {
93+ auto pos = input.find(":");
94+ string src = input.substr(0, pos);
95+ string dest = input.substr(pos + 1);
96+ return (struct DirMapping){ src, dest };
97+}
98+
99+static void handle_child_death(int signo, siginfo_t *info, void *context) {
100+ if ( (child_pid == 0) || (info->si_pid == child_pid) ) {
101+ child_died = 1;
102+ }
103+}
104+
105+int main(int argc, char *argv[]) {
106+ uint8_t clear_env = 0;
107+ uint8_t enable_escape_hatch = 0;
108+ char *nixdir = NULL;
109+ list<struct DirMapping> dirMappings;
110+ list<struct SetEnv> envMappings;
111+ const char *t;
112+
113+#define x(y) dirMappings.push_back({ "/" y, y })
114+ x("dev");
115+ x("proc");
116+ x("sys");
117+ x("run");
118+ x("tmp");
119+ x("var");
120+ x("etc");
121+ x("usr");
122+ x("home");
123+ x("root");
124+#undef x
125+
126+ int opt;
127+ while ((opt = getopt(argc, argv, "cen:m:dp:")) != -1) {
128+ switch (opt) {
129+ case 'c':
130+ clear_env = 1;
131+ break;
132+ case 'e':
133+ enable_escape_hatch = 1;
134+ break;
135+ case 'n':
136+ // determine absolute directory for nix dir
137+ nixdir = realpath(optarg, NULL);
138+ if (!nixdir) {
139+ err_exit("realpath(%s)", optarg);
140+ }
141+ break;
142+ case 'm':
143+ dirMappings.push_back(parseMapping(optarg));
144+ break;
145+ case 'd':
146+ dirMappings.clear();
147+ break;
148+ case 'p':
149+ t = getenv(optarg);
150+ if (t) {
151+ envMappings.push_back({ optarg, t });
152+ }
153+ break;
154+ }
155+ }
156+
157+ if (!nixdir) {
158+ fprintf(stderr, "-n <nixdir> is required\n");
159+ exit(EXIT_FAILURE);
160+ }
161+
162+ if (argc <= optind) {
163+ usage(argv[0]);
164+ }
165+
166+ const char *tmpdir = getenv("TMPDIR");
167+ if (!tmpdir) {
168+ tmpdir = "/tmp";
169+ }
170+
171+ char template_[PATH_MAX];
172+ int needed = snprintf(template_, PATH_MAX, "%s/nixXXXXXX", tmpdir);
173+ if (needed < 0) {
174+ err_exit("TMPDIR too long: '%s'", tmpdir);
175+ }
176+
177+ char *rootdir = mkdtemp(template_);
178+ if (!rootdir) {
179+ err_exit("mkdtemp(%s)", template_);
180+ }
181+
182+ int unrace[2];
183+
184+ if (pipe(unrace)) {
185+ err_exit("pipe()");
186+ }
187+
188+ struct sigaction handle_child;
189+ handle_child.sa_sigaction = handle_child_death;
190+ handle_child.sa_flags = SA_SIGINFO;
191+
192+ struct sigaction old_handler;
193+ if (sigaction(SIGCHLD, &handle_child, &old_handler)) {
194+ err_exit("sigaction()");
195+ }
196+
197+ int child;
198+ child = child_pid = fork();
199+ if (child < 0) {
200+ err_exit("fork()");
201+ } else if (child == 0) {
202+ sigaction(SIGCHLD, &old_handler, NULL);
203+ close(unrace[1]);
204+ char buf[10];
205+ read(unrace[0], buf, 10);
206+ close(unrace[0]);
207+ return child_proc(rootdir, nixdir, clear_env, dirMappings, envMappings, argv[optind], argv + optind);
208+ } else {
209+ close(unrace[0]);
210+ char fifopath[PATH_MAX];
211+ if (enable_escape_hatch) {
212+ snprintf(fifopath, PATH_MAX, "%s/escape-hatch", rootdir);
213+ mkfifo(fifopath, 0600);
214+ }
215+ close(unrace[1]);
216+ if (enable_escape_hatch) {
217+ char buffer[1024];
218+ while (!child_died) {
219+ int fd = open(fifopath, O_RDONLY);
220+ if (fd < 0) {
221+ if (errno == EINTR) continue;
222+ fprintf(stderr, "error opening escape-hatch: %s\n", strerror(errno));
223+ continue;
224+ }
225+ int size = read(fd, buffer, 1024);
226+ buffer[size] = 0;
227+ system(buffer);
228+ close(fd);
229+ }
230+ }
231+ int status;
232+ int ret = waitpid(child, &status, 0);
233+ return WEXITSTATUS(status);
234+ }
235+}
236+
237+static int child_proc(const char *rootdir, const char *nixdir, uint8_t clear_env, list<struct DirMapping> dirMappings, list<struct SetEnv> envMappings, const char *executable, char * const new_argv[]) {
238+ // get uid, gid before going to new namespace
239+ uid_t uid = getuid();
240+ gid_t gid = getgid();
241+
242+ // "unshare" into new namespace
243+ if (unshare(CLONE_NEWNS | CLONE_NEWUSER) < 0) {
244+ if (errno == EPERM) {
245+ fputs("Run the following to enable unprivileged namespace use:\nsudo bash -c \"sysctl -w kernel.unprivileged_userns_clone=1 ; echo kernel.unprivileged_userns_clone=1 > /etc/sysctl.d/nix-user-chroot.conf\"\n\n", stderr);
246+ exit(EXIT_FAILURE);
247+ } else {
248+ err_exit("unshare()");
249+ }
250+ }
251+
252+ // add necessary system stuff to rootdir namespace
253+ for (list<struct DirMapping>::iterator it = dirMappings.begin();
254+ it != dirMappings.end(); ++it) {
255+ struct DirMapping m = *it;
256+ add_path(m.src, m.dest, rootdir);
257+ }
258+
259+ // make sure nixdir exists
260+ struct stat statbuf2;
261+ if (stat(nixdir, &statbuf2) < 0) {
262+ err_exit("stat(%s)", nixdir);
263+ }
264+
265+ char path_buf[PATH_MAX];
266+ // mount /nix to new namespace
267+ snprintf(path_buf, sizeof(path_buf), "%s/nix", rootdir);
268+ mkdir(path_buf, statbuf2.st_mode & ~S_IFMT);
269+ if (mount(nixdir, path_buf, "none", MS_BIND | MS_REC, NULL) < 0) {
270+ err_exit("mount(%s, %s)", nixdir, path_buf);
271+ }
272+
273+ // fixes issue #1 where writing to /proc/self/gid_map fails
274+ // see user_namespaces(7) for more documentation
275+ int fd_setgroups = open("/proc/self/setgroups", O_WRONLY);
276+ if (fd_setgroups > 0) {
277+ write(fd_setgroups, "deny", 4);
278+ close(fd_setgroups);
279+ }
280+
281+ // map the original uid/gid in the new ns
282+ char map_buf[1024];
283+ snprintf(map_buf, sizeof(map_buf), "%d %d 1", uid, uid);
284+ update_map(map_buf, "/proc/self/uid_map");
285+ snprintf(map_buf, sizeof(map_buf), "%d %d 1", gid, gid);
286+ update_map(map_buf, "/proc/self/gid_map");
287+
288+ // chroot to rootdir
289+ if (chroot(rootdir) < 0) {
290+ err_exit("chroot(%s)", rootdir);
291+ }
292+
293+ chdir("/");
294+
295+ if (clear_env) clearenv();
296+ setenv("PATH", ENV_PATH, 1);
297+
298+ for (list<struct SetEnv>::iterator it = envMappings.begin();
299+ it != envMappings.end(); ++it) {
300+ struct SetEnv e = *it;
301+ setenv(e.key.c_str(), e.value.c_str(), 1);
302+ }
303+
304+ // execute the command
305+ execvp(executable, new_argv);
306+ err_exit("execvp(%s)", executable);
307+}
release.nix+1−1
@@ -4,7 +4,7 @@
44stdenv.mkDerivation rec {
55 pname = "nix-bundle";
66 name = "${pname}-${version}";
7− version = "0.2.0";
7+ version = "0.4.0";
88
99 src = ./.;
1010
test-appimage.nixnew file+14
@@ -0,0 +1,14 @@
1+{ appimagefile, nixpkgs' ? <nixpkgs> }:
2+
3+# nix build -f test-appimage.nix --arg appimagefile ./VLC*AppImage
4+
5+with import nixpkgs' {};
6+
7+runCommand "patchelf" {} ''
8+ cp ${appimagefile} $out
9+ chmod +w $out
10+ patchelf \
11+ --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \
12+ --set-rpath ${stdenv.glibc.out}/lib:${fuse}/lib:${zlib}/lib:${glib}/lib \
13+ $out
14+''
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
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