commit
1dc9931937
|
@ -5,8 +5,6 @@
|
||||||
programs.nix-ld.enable = lib.mkEnableOption ''nix-ld, Documentation: <link xlink:href="https://github.com/Mic92/nix-ld"/>'';
|
programs.nix-ld.enable = lib.mkEnableOption ''nix-ld, Documentation: <link xlink:href="https://github.com/Mic92/nix-ld"/>'';
|
||||||
};
|
};
|
||||||
config = lib.mkIf config.programs.nix-ld.enable {
|
config = lib.mkIf config.programs.nix-ld.enable {
|
||||||
systemd.tmpfiles.rules = [
|
systemd.tmpfiles.packages = [ pkgs.nix-ld ];
|
||||||
"L+ ${pkgs.nix-ld.ldPath} - - - - ${pkgs.nix-ld}/libexec/nix-ld"
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,7 +6,7 @@ import ./make-test-python.nix ({ lib, pkgs, ...} :
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
(pkgs.runCommand "patched-hello" {} ''
|
(pkgs.runCommand "patched-hello" {} ''
|
||||||
install -D -m755 ${pkgs.hello}/bin/hello $out/bin/hello
|
install -D -m755 ${pkgs.hello}/bin/hello $out/bin/hello
|
||||||
patchelf $out/bin/hello --set-interpreter ${pkgs.nix-ld.ldPath}
|
patchelf $out/bin/hello --set-interpreter $(cat ${pkgs.nix-ld}/nix-support/ldpath)
|
||||||
'')
|
'')
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,49 +1,56 @@
|
||||||
{ stdenv, meson, ninja, lib, nixosTests, fetchFromGitHub }:
|
{ lib
|
||||||
|
, stdenv
|
||||||
|
, fetchFromGitHub
|
||||||
|
, meson
|
||||||
|
, ninja
|
||||||
|
, nixosTests
|
||||||
|
}:
|
||||||
let
|
let
|
||||||
self = stdenv.mkDerivation {
|
libDir = if builtins.elem stdenv.system [ "x86_64-linux" "mips64-linux" "powerpc64le-linux" ]
|
||||||
name = "nix-ld";
|
then "/lib64"
|
||||||
src = fetchFromGitHub {
|
else "/lib";
|
||||||
owner = "Mic92";
|
in
|
||||||
repo = "nix-ld";
|
stdenv.mkDerivation rec {
|
||||||
rev = "1.0.0";
|
pname = "nix-ld";
|
||||||
sha256 = "sha256-QYPg8wPpq7q5Xd1jW17Lh36iKFSsVkN/gWYoQRv2XoU=";
|
version = "1.0.2";
|
||||||
};
|
|
||||||
|
|
||||||
doCheck = true;
|
src = fetchFromGitHub {
|
||||||
|
owner = "mic92";
|
||||||
nativeBuildInputs = [ meson ninja ];
|
repo = "nix-ld";
|
||||||
|
rev = version;
|
||||||
mesonFlags = [
|
sha256 = "sha256-DlWU5i/MykqWgB9vstYbECy3e+XagXWCxi+XDJNey0s=";
|
||||||
"-Dnix-system=${stdenv.system}"
|
|
||||||
];
|
|
||||||
|
|
||||||
hardeningDisable = [
|
|
||||||
"stackprotector"
|
|
||||||
];
|
|
||||||
|
|
||||||
postInstall = ''
|
|
||||||
mkdir -p $out/nix-support
|
|
||||||
basename $(< ${stdenv.cc}/nix-support/dynamic-linker) > $out/nix-support/ld-name
|
|
||||||
'';
|
|
||||||
|
|
||||||
passthru.tests.nix-ld = nixosTests.nix-ld;
|
|
||||||
passthru.ldPath = let
|
|
||||||
libDir = if stdenv.system == "x86_64-linux" ||
|
|
||||||
stdenv.system == "mips64-linux" ||
|
|
||||||
stdenv.system == "powerpc64le-linux"
|
|
||||||
then
|
|
||||||
"/lib64"
|
|
||||||
else
|
|
||||||
"/lib";
|
|
||||||
ldName = lib.fileContents "${self}/nix-support/ld-name";
|
|
||||||
in "${libDir}/${ldName}";
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "Run unpatched dynamic binaries on NixOS";
|
|
||||||
homepage = "https://github.com/Mic92/nix-ld";
|
|
||||||
license = licenses.mit;
|
|
||||||
maintainers = with maintainers; [ mic92 ];
|
|
||||||
platforms = platforms.linux;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
in self
|
|
||||||
|
doCheck = true;
|
||||||
|
|
||||||
|
nativeBuildInputs = [ meson ninja ];
|
||||||
|
|
||||||
|
mesonFlags = [
|
||||||
|
"-Dnix-system=${stdenv.system}"
|
||||||
|
];
|
||||||
|
|
||||||
|
hardeningDisable = [
|
||||||
|
"stackprotector"
|
||||||
|
];
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
mkdir -p $out/nix-support
|
||||||
|
|
||||||
|
ldpath=${libDir}/$(basename $(< ${stdenv.cc}/nix-support/dynamic-linker))
|
||||||
|
echo "$ldpath" > $out/nix-support/ldpath
|
||||||
|
mkdir -p $out/lib/tmpfiles.d/
|
||||||
|
cat > $out/lib/tmpfiles.d/nix-ld.conf <<EOF
|
||||||
|
L+ $ldpath - - - - $out/libexec/nix-ld
|
||||||
|
EOF
|
||||||
|
'';
|
||||||
|
|
||||||
|
passthru.tests.nix-ld = nixosTests.nix-ld;
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
description = "Run unpatched dynamic binaries on NixOS";
|
||||||
|
homepage = "https://github.com/Mic92/nix-ld";
|
||||||
|
license = licenses.mit;
|
||||||
|
maintainers = with maintainers; [ mic92 ];
|
||||||
|
platforms = platforms.unix;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue