git.iko.soy/nix-bundle
on 8e39653 help sign in
e9fa7e8
swap
0 ahead, 6 behind
3 files changed+14−16
since splitsnapshots
unifiedsplit
appdir.nix+2−2 appimagetool.nix+2−2 default.nix+10−12
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 }:
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='"${lib.makeBinPath targets}"'
11+ $CC ${./AppRun.c} -o AppRun -DENV_PATH='"${stdenv.lib.makeBinPath targets}"'
1212 '';
1313
1414 installPhase = ''
appimagetool.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, lib, fetchurl, fuse, zlib, squashfsTools, glib }:
1+{ stdenv, 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 ${lib.makeLibraryPath [ zlib stdenv.glibc.out fuse glib ]} \
40+ --set-rpath ${stdenv.lib.makeLibraryPath [ zlib stdenv.glibc.out fuse glib ]} \
4141 $x
4242 done
4343 '';
default.nix+10−12
@@ -11,11 +11,10 @@ let
1111 });
1212in rec {
1313 toStorePath = target:
14− # If a store path has been given but is not a derivation, add the missing context
14+ # If a store path has been given but is a string, add the missing context
1515 # 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; }; }
16+ if builtins.isString target && lib.isStorePath target then
17+ builtins.appendContext target { "${target}" = { path = true; }; }
1918 # Otherwise, add to the store. This takes care of appending the store path
2019 # in the context automatically.
2120 else "${target}";
@@ -45,7 +44,7 @@ in rec {
4544 };
4645
4746 # TODO: eventually should this go in nixpkgs?
48− nix-user-chroot = lib.makeOverridable stdenv.mkDerivation {
47+ nix-user-chroot = stdenv.lib.makeOverridable stdenv.mkDerivation {
4948 name = "nix-user-chroot-2c52b5f";
5049 src = ./nix-user-chroot;
5150
@@ -80,20 +79,19 @@ in rec {
8079 };
8180 };
8281
83− makeStartup = { target, nixUserChrootFlags, nix-user-chroot', run, initScript }:
82+ makeStartup = { target, nixUserChrootFlags, nix-user-chroot', run }:
8483 let
8584 # Avoid re-adding a store path into the store
8685 path = toStorePath target;
8786 in
8887 writeScript "startup" ''
8988 #!/bin/sh
90− ${initScript}
9189 .${nix-user-chroot'}/bin/nix-user-chroot -n ./nix ${nixUserChrootFlags} -- ${path}${run} "$@"
9290 '';
9391
94− nix-bootstrap = { target, extraTargets ? [], run, nix-user-chroot' ? nix-user-chroot, nixUserChrootFlags ? "", initScript ? "" }:
92+ nix-bootstrap = { target, extraTargets ? [], run, nix-user-chroot' ? nix-user-chroot, nixUserChrootFlags ? "" }:
9593 let
96− script = makeStartup { inherit target nixUserChrootFlags nix-user-chroot' run initScript; };
94+ script = makeStartup { inherit target nixUserChrootFlags nix-user-chroot' run; };
9795 in makebootstrap {
9896 startup = ".${script} '\"$@\"'";
9997 targets = [ "${script}" ] ++ extraTargets;
@@ -110,10 +108,10 @@ in rec {
110108 nix-user-chroot'' = targets: nix-user-chroot.overrideDerivation (o: {
111109 buildInputs = o.buildInputs ++ targets;
112110 makeFlags = o.makeFlags ++ [
113− ''ENV_PATH="${lib.makeBinPath targets}"''
111+ ''ENV_PATH="${stdenv.lib.makeBinPath targets}"''
114112 ];
115− }); in { target, extraTargets ? [], run, initScript ? "" }: nix-bootstrap {
116− inherit target extraTargets run initScript;
113+ }); in { target, extraTargets ? [], run }: nix-bootstrap {
114+ inherit target extraTargets run;
117115 nix-user-chroot' = nix-user-chroot'' extraTargets;
118116 };
119117}