From 548d50d6952de1128b5cbd535bb5f8be9b7c843c Mon Sep 17 00:00:00 2001 From: Luigi Sartor Piucco Date: Tue, 23 Feb 2021 11:47:40 -0300 Subject: [PATCH] build-fhs-userenv-bubblewrap:->writeShellScriptBin --- pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix index 73d705dbaa6..b9c719a4c78 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildEnv, writeText, writeScriptBin, pkgs, pkgsi686Linux }: +{ stdenv, lib, buildEnv, writeText, writeShellScriptBin, pkgs, pkgsi686Linux }: { name, profile ? "" , targetPkgs ? pkgs: [], multiPkgs ? pkgs: [] @@ -49,9 +49,7 @@ let [ (toString gcc.cc.lib) ]; - ldconfig = writeScriptBin "ldconfig" '' - #!${pkgs.stdenv.shell} - + ldconfig = writeShellScriptBin "ldconfig" '' exec ${pkgs.glibc.bin}/bin/ldconfig -f /etc/ld.so.conf -C /etc/ld.so.cache "$@" ''; etcProfile = writeText "profile" ''