Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 415acd19c198
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3a7fe07e3cc5
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 18, 2019

  1. add config.environment.ld-linux 

    Add option to install symlink to ld-linux(8) system-wide to allow running unmodified ELF binaries.
It might be useful to run games or executables distributed inside jar files as discussed
https://discourse.nixos.org/t/runtime-alternative-to-patchelf-set-interpreter/3539
https://discourse.nixos.org/t/running-binaries-without-fhs-and-patchelf/1828

It is the third concession to FHS after `/bin/sh` and `/usr/bin/env` but it is disabled by default unlike those two
    volth committed Sep 18, 2019
    Copy the full SHA
    af665d8 View commit details

Commits on Sep 19, 2019

  1. rmdir: avoid failing when directory did not exist 

    I bet nobody has `environment.usrbinenv = null`, it would fail on the second activation trying to `rmdir` inexisting `/usr/bin`
    volth authored Sep 19, 2019
    Copy the full SHA
    45db499 View commit details

Commits on Jan 28, 2020

  1. Merge pull request #69057 from volth/ld-linux 

    add config.environment.ld-linux
    @matthewbauer
    matthewbauer authored Jan 28, 2020
    Copy the full SHA
    3a7fe07 View commit details
Showing with 32 additions and 1 deletion.
  1. +32 −1 nixos/modules/system/activation/activation-script.nix
33 changes: 32 additions & 1 deletion nixos/modules/system/activation/activation-script.nix
View file
Original file line number Diff line number Diff line change
@@ -162,6 +162,16 @@ in
<literal>/usr/bin/env</literal>.
'';
};

environment.ld-linux = mkOption {
default = false;
type = types.bool;
visible = false;
description = ''
Install symlink to ld-linux(8) system-wide to allow running unmodified ELF binaries.
It might be useful to run games or executables distributed inside jar files.
'';
};
};


@@ -195,9 +205,30 @@ in
''
else ''
rm -f /usr/bin/env
rmdir --ignore-fail-on-non-empty /usr/bin /usr
rmdir -p /usr/bin || true
'';

system.activationScripts.ld-linux =
concatStrings (
mapAttrsToList
(target: source:
if config.environment.ld-linux then ''
mkdir -m 0755 -p $(dirname ${target})
ln -sfn ${escapeShellArg source} ${target}.tmp
mv -f ${target}.tmp ${target} # atomically replace
'' else ''
rm -f ${target}
rmdir $(dirname ${target}) || true
'')
{
"i686-linux" ."/lib/ld-linux.so.2" = "${pkgs.glibc.out}/lib/ld-linux.so.2";
"x86_64-linux" ."/lib/ld-linux.so.2" = "${pkgs.pkgsi686Linux.glibc.out}/lib/ld-linux.so.2";
"x86_64-linux" ."/lib64/ld-linux-x86-64.so.2" = "${pkgs.glibc.out}/lib64/ld-linux-x86-64.so.2";
"aarch64-linux"."/lib/ld-linux-aarch64.so.1" = "${pkgs.glibc.out}/lib/ld-linux-aarch64.so.1";
"armv7l-linux" ."/lib/ld-linux-armhf.so.3" = "${pkgs.glibc.out}/lib/ld-linux-armhf.so.3";
}.${pkgs.stdenv.system} or {}
);

system.activationScripts.specialfs =
''
specialMount() {