git.iko.soy/nix-bundle
on master help sign in
remove usage of stdenv.lib

this was removed in recent nixpkgs

commit2e39b202b2efcfca9be8f4774ad6d0de1aec8b84 authorSymphorien Gibol <symphorien+git@xlumurb.eu> dateMon 19 Jul 2021, 12:00 (5 years ago) parent8e39653
3 files changed+6−6
compare with master
unifiedsplit
appdir.nix+2−2 appimagetool.nix+2−2 default.nix+2−2
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+2−2
@@ -44,7 +44,7 @@ in rec {
4444 };
4545
4646 # TODO: eventually should this go in nixpkgs?
47− nix-user-chroot = stdenv.lib.makeOverridable stdenv.mkDerivation {
47+ nix-user-chroot = lib.makeOverridable stdenv.mkDerivation {
4848 name = "nix-user-chroot-2c52b5f";
4949 src = ./nix-user-chroot;
5050
@@ -108,7 +108,7 @@ in rec {
108108 nix-user-chroot'' = targets: nix-user-chroot.overrideDerivation (o: {
109109 buildInputs = o.buildInputs ++ targets;
110110 makeFlags = o.makeFlags ++ [
111− ''ENV_PATH="${stdenv.lib.makeBinPath targets}"''
111+ ''ENV_PATH="${lib.makeBinPath targets}"''
112112 ];
113113 }); in { target, extraTargets ? [], run }: nix-bootstrap {
114114 inherit target extraTargets run;