git.iko.soy/nix-bundle
on master help sign in
swap
e9fa7e85 ahead, 0 behind
3 files changed+12−11
since splitsnapshots
unifiedsplit
appdir.nix+2−2 appimagetool.nix+2−2 default.nix+8−7
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 }:
22
33let
44 AppRun = targets: muslPkgs.stdenv.mkDerivation {
@@ -8,7 +8,7 @@ let
88
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 }:
22
33# This is from some binaries.
44
@@ -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+8−7
@@ -45,7 +45,7 @@ in rec {
4545 };
4646
4747 # TODO: eventually should this go in nixpkgs?
48− nix-user-chroot = stdenv.lib.makeOverridable stdenv.mkDerivation {
48+ nix-user-chroot = lib.makeOverridable stdenv.mkDerivation {
4949 name = "nix-user-chroot-2c52b5f";
5050 src = ./nix-user-chroot;
5151
@@ -80,19 +80,20 @@ in rec {
8080 };
8181 };
8282
83− makeStartup = { target, nixUserChrootFlags, nix-user-chroot', run }:
83+ makeStartup = { target, nixUserChrootFlags, nix-user-chroot', run, initScript }:
8484 let
8585 # Avoid re-adding a store path into the store
8686 path = toStorePath target;
8787 in
8888 writeScript "startup" ''
8989 #!/bin/sh
90+ ${initScript}
9091 .${nix-user-chroot'}/bin/nix-user-chroot -n ./nix ${nixUserChrootFlags} -- ${path}${run} "$@"
9192 '';
9293
93− 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 ? "" }:
9495 let
95− script = makeStartup { inherit target nixUserChrootFlags nix-user-chroot' run; };
96+ script = makeStartup { inherit target nixUserChrootFlags nix-user-chroot' run initScript; };
9697 in makebootstrap {
9798 startup = ".${script} '\"$@\"'";
9899 targets = [ "${script}" ] ++ extraTargets;
@@ -109,10 +110,10 @@ in rec {
109110 nix-user-chroot'' = targets: nix-user-chroot.overrideDerivation (o: {
110111 buildInputs = o.buildInputs ++ targets;
111112 makeFlags = o.makeFlags ++ [
112− ''ENV_PATH="${stdenv.lib.makeBinPath targets}"''
113+ ''ENV_PATH="${lib.makeBinPath targets}"''
113114 ];
114− }); in { target, extraTargets ? [], run }: nix-bootstrap {
115− inherit target extraTargets run;
115+ }); in { target, extraTargets ? [], run, initScript ? "" }: nix-bootstrap {
116+ inherit target extraTargets run initScript;
116117 nix-user-chroot' = nix-user-chroot'' extraTargets;
117118 };
118119}