git.iko.soy/nix-bundle
on master help sign in
swap
e9fa7e811 ahead, 0 behind
appdir.nix+2−2
since splitsnapshots
unifiedsplit
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, muslPkgs, perl, pathsFromGraph, fetchFromGitHub, coreutils, bash }:
1+{ stdenv, lib, fetchurl, muslPkgs, perl, pathsFromGraph, fetchFromGitHub, coreutils, bash }:
2
2
3let
3let
4 AppRun = targets: muslPkgs.stdenv.mkDerivation {
4 AppRun = targets: muslPkgs.stdenv.mkDerivation {
@@ -8,7 +8,7 @@ let
8
8
9 buildPhase = ''
9 buildPhase = ''
10 CC="$CC -O2 -Wall -Wno-deprecated-declarations -Wno-unused-result -static"
10 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}"'
12 '';
12 '';
13
13
14 installPhase = ''
14 installPhase = ''
appimagetool.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, fuse, zlib, squashfsTools, glib }:
1+{ stdenv, lib, fetchurl, fuse, zlib, squashfsTools, glib }:
2
2
3# This is from some binaries.
3# This is from some binaries.
4
4
@@ -37,7 +37,7 @@ in stdenv.mkDerivation rec {
37 for x in $out/bin/*; do
37 for x in $out/bin/*; do
38 patchelf \
38 patchelf \
39 --set-interpreter ${dynamicLinker} \
39 --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 ]} \
41 $x
41 $x
42 done
42 done
43 '';
43 '';
default.nix+12−10
@@ -11,10 +11,11 @@ let
11 });
11 });
12in rec {
12in rec {
13 toStorePath = target:
13 toStorePath = target:
14− # If a store path has been given but is a string, add the missing context
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.
15 # to it so it will be propagated properly as a build input.
16− if builtins.isString target && lib.isStorePath target then
16+ if !(lib.isDerivation target) && lib.isStorePath target then
17+ let path = toString target; in
17− builtins.appendContext target { "${target}" = { path = true; }; }
18+ builtins.appendContext path { "${path}" = { path = true; }; }
18 # Otherwise, add to the store. This takes care of appending the store path
19 # Otherwise, add to the store. This takes care of appending the store path
19 # in the context automatically.
20 # in the context automatically.
20 else "${target}";
21 else "${target}";
@@ -44,7 +45,7 @@ in rec {
44 };
45 };
45
46
46 # TODO: eventually should this go in nixpkgs?
47 # TODO: eventually should this go in nixpkgs?
47− nix-user-chroot = stdenv.lib.makeOverridable stdenv.mkDerivation {
48+ nix-user-chroot = lib.makeOverridable stdenv.mkDerivation {
48 name = "nix-user-chroot-2c52b5f";
49 name = "nix-user-chroot-2c52b5f";
49 src = ./nix-user-chroot;
50 src = ./nix-user-chroot;
50
51
@@ -79,19 +80,20 @@ in rec {
79 };
80 };
80 };
81 };
81
82
82− makeStartup = { target, nixUserChrootFlags, nix-user-chroot', run }:
83+ makeStartup = { target, nixUserChrootFlags, nix-user-chroot', run, initScript }:
83 let
84 let
84 # Avoid re-adding a store path into the store
85 # Avoid re-adding a store path into the store
85 path = toStorePath target;
86 path = toStorePath target;
86 in
87 in
87 writeScript "startup" ''
88 writeScript "startup" ''
88 #!/bin/sh
89 #!/bin/sh
90+ ${initScript}
89 .${nix-user-chroot'}/bin/nix-user-chroot -n ./nix ${nixUserChrootFlags} -- ${path}${run} "$@"
91 .${nix-user-chroot'}/bin/nix-user-chroot -n ./nix ${nixUserChrootFlags} -- ${path}${run} "$@"
90 '';
92 '';
91
93
92− 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 ? "" }:
93 let
95 let
94− script = makeStartup { inherit target nixUserChrootFlags nix-user-chroot' run; };
96+ script = makeStartup { inherit target nixUserChrootFlags nix-user-chroot' run initScript; };
95 in makebootstrap {
97 in makebootstrap {
96 startup = ".${script} '\"$@\"'";
98 startup = ".${script} '\"$@\"'";
97 targets = [ "${script}" ] ++ extraTargets;
99 targets = [ "${script}" ] ++ extraTargets;
@@ -108,10 +110,10 @@ in rec {
108 nix-user-chroot'' = targets: nix-user-chroot.overrideDerivation (o: {
110 nix-user-chroot'' = targets: nix-user-chroot.overrideDerivation (o: {
109 buildInputs = o.buildInputs ++ targets;
111 buildInputs = o.buildInputs ++ targets;
110 makeFlags = o.makeFlags ++ [
112 makeFlags = o.makeFlags ++ [
111− ''ENV_PATH="${stdenv.lib.makeBinPath targets}"''
113+ ''ENV_PATH="${lib.makeBinPath targets}"''
112 ];
114 ];
113− }); in { target, extraTargets ? [], run }: nix-bootstrap {
115+ }); in { target, extraTargets ? [], run, initScript ? "" }: nix-bootstrap {
114− inherit target extraTargets run;
116+ inherit target extraTargets run initScript;
115 nix-user-chroot' = nix-user-chroot'' extraTargets;
117 nix-user-chroot' = nix-user-chroot'' extraTargets;
116 };
118 };
117}
119}
flake.nix+1−1
@@ -13,7 +13,7 @@
13 nix-bundle = import self { nixpkgs = nixpkgs'; };
13 nix-bundle = import self { nixpkgs = nixpkgs'; };
14 script = nixpkgs'.writeScript "startup" ''
14 script = nixpkgs'.writeScript "startup" ''
15 #!/bin/sh
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 '';
17 '';
18 in nix-bundle.makebootstrap {
18 in nix-bundle.makebootstrap {
19 targets = [ script ];
19 targets = [ script ];
nix-bundle.sh+1−1
@@ -59,5 +59,5 @@ elif [ -t 1 ]; then
59 echo "Nix bundle created at $filename."
59 echo "Nix bundle created at $filename."
60 cp -f "$out" "$filename"
60 cp -f "$out" "$filename"
61else
61else
62− cat "$out"
62+ echo "$out"
63fi
63fi