diff --git a/appdir.nix b/appdir.nix index 1378ca9..feef893 100644 --- a/appdir.nix +++ b/appdir.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, muslPkgs, perl, pathsFromGraph, fetchFromGitHub, coreutils, bash }: +{ stdenv, lib, fetchurl, muslPkgs, perl, pathsFromGraph, fetchFromGitHub, coreutils, bash }: let AppRun = targets: muslPkgs.stdenv.mkDerivation { @@ -8,7 +8,7 @@ let buildPhase = '' CC="$CC -O2 -Wall -Wno-deprecated-declarations -Wno-unused-result -static" - $CC ${./AppRun.c} -o AppRun -DENV_PATH='"${stdenv.lib.makeBinPath targets}"' + $CC ${./AppRun.c} -o AppRun -DENV_PATH='"${lib.makeBinPath targets}"' ''; installPhase = '' diff --git a/appimagetool.nix b/appimagetool.nix index e47b9d5..6590e1f 100644 --- a/appimagetool.nix +++ b/appimagetool.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fuse, zlib, squashfsTools, glib }: +{ stdenv, lib, fetchurl, fuse, zlib, squashfsTools, glib }: # This is from some binaries. @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { for x in $out/bin/*; do patchelf \ --set-interpreter ${dynamicLinker} \ - --set-rpath ${stdenv.lib.makeLibraryPath [ zlib stdenv.glibc.out fuse glib ]} \ + --set-rpath ${lib.makeLibraryPath [ zlib stdenv.glibc.out fuse glib ]} \ $x done ''; diff --git a/default.nix b/default.nix index d87ace3..a5e1cd8 100644 --- a/default.nix +++ b/default.nix @@ -44,7 +44,7 @@ in rec { }; # TODO: eventually should this go in nixpkgs? - nix-user-chroot = stdenv.lib.makeOverridable stdenv.mkDerivation { + nix-user-chroot = lib.makeOverridable stdenv.mkDerivation { name = "nix-user-chroot-2c52b5f"; src = ./nix-user-chroot; @@ -108,7 +108,7 @@ in rec { nix-user-chroot'' = targets: nix-user-chroot.overrideDerivation (o: { buildInputs = o.buildInputs ++ targets; makeFlags = o.makeFlags ++ [ - ''ENV_PATH="${stdenv.lib.makeBinPath targets}"'' + ''ENV_PATH="${lib.makeBinPath targets}"'' ]; }); in { target, extraTargets ? [], run }: nix-bootstrap { inherit target extraTargets run;