git.iko.soy/typeable/nixpkgs
on master help sign in
Revert "add config.environment.ld-linux"

This reverts commit af665d822a166ae62547c1c310207f11acaded17, see https://github.com/NixOS/nixpkgs/pull/78798#issuecomment-580059834 for the reasons in a similar PR.

commit26aba55951a09340959b68330875904ac43a3a31 authorEelco Dolstra <edolstra@gmail.com> dateSun 2 Feb 2020, 15:29 (7 years ago) parent5495cb9
1 file changed−31
nixos/modules/system/activation/activation-script.nix−31
nixos/modules/system/activation/activation-script.nix−31
@@ -162,16 +162,6 @@ in
162162 <literal>/usr/bin/env</literal>.
163163 '';
164164 };
165−
166− environment.ld-linux = mkOption {
167− default = false;
168− type = types.bool;
169− visible = false;
170− description = ''
171− Install symlink to ld-linux(8) system-wide to allow running unmodified ELF binaries.
172− It might be useful to run games or executables distributed inside jar files.
173− '';
174− };
175165 };
176166
177167
@@ -208,27 +198,6 @@ in
208198 rmdir --ignore-fail-on-non-empty /usr/bin /usr
209199 '';
210200
211− system.activationScripts.ld-linux =
212− concatStrings (
213− mapAttrsToList
214− (target: source:
215− if config.environment.ld-linux then ''
216− mkdir -m 0755 -p $(dirname ${target})
217− ln -sfn ${escapeShellArg source} ${target}.tmp
218− mv -f ${target}.tmp ${target} # atomically replace
219− '' else ''
220− rm -f ${target}
221− rmdir --ignore-fail-on-non-empty $(dirname ${target})
222− '')
223− {
224− "i686-linux" ."/lib/ld-linux.so.2" = "${pkgs.glibc.out}/lib/ld-linux.so.2";
225− "x86_64-linux" ."/lib/ld-linux.so.2" = "${pkgs.pkgsi686Linux.glibc.out}/lib/ld-linux.so.2";
226− "x86_64-linux" ."/lib64/ld-linux-x86-64.so.2" = "${pkgs.glibc.out}/lib64/ld-linux-x86-64.so.2";
227− "aarch64-linux"."/lib/ld-linux-aarch64.so.1" = "${pkgs.glibc.out}/lib/ld-linux-aarch64.so.1";
228− "armv7l-linux" ."/lib/ld-linux-armhf.so.3" = "${pkgs.glibc.out}/lib/ld-linux-armhf.so.3";
229− }.${pkgs.stdenv.system} or {}
230− );
231−
232201 system.activationScripts.specialfs =
233202 ''
234203 specialMount() {