ilyakooo0/nix-bundle
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nix-bundle.git synced 2024-08-15 18:00:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #83 from symphorien/fix-stdenv-lib

Browse Source 
remove usage of stdenv.lib
This commit is contained in:
Matthew Bauer 2021-07-19 09:28:03 -05:00 committed by GitHub
commit 0c6deae1f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
appdir.nix
View File

@ -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 = ''

4
appimagetool.nix
View File

@ -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
'';

4
default.nix
View File

@ -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;