Unverified Commit ea503179 authored by Jörg Thalheim's avatar Jörg Thalheim Committed by GitHub
Browse files

Merge pull request #298607 from Mic92/nix-ld-rs 

nix-ld-rs: init at 2024-03-23
parents 4d6ffc29 04ec4568

nixos/tests/nix-ld.nix

+37 −15
Original line number Diff line number Diff line 
import ./make-test-python.nix ({ lib, pkgs, ...} :

{ system ? builtins.currentSystem,

  config ? {},

  pkgs ? import ../.. { inherit system config; }

}:

let

  inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest;

  shared =

    { config, pkgs, ... }:

    {

  name = "nix-ld";

  nodes.machine = { pkgs, ... }: {

      programs.nix-ld.enable = true;

      environment.systemPackages = [

        (pkgs.runCommand "patched-hello" { } ''

          install -D -m755 ${pkgs.hello}/bin/hello $out/bin/hello

        patchelf $out/bin/hello --set-interpreter $(cat ${pkgs.nix-ld}/nix-support/ldpath)

          patchelf $out/bin/hello --set-interpreter $(cat ${config.programs.nix-ld.package}/nix-support/ldpath)

        '')

      ];

    };

in

{

  nix-ld = makeTest {

    name = "nix-ld";

    nodes.machine = shared;

    testScript = ''

      start_all()

      machine.succeed("hello")

    '';

  };

  nix-ld-rs = makeTest {

    name = "nix-ld-rs";

    nodes.machine = {

      imports = [ shared ];

      programs.nix-ld.package = pkgs.nix-ld-rs;

    };

    testScript = ''

      start_all()

      machine.succeed("hello")

    '';

})
 
  };

}

pkgs/by-name/ni/nix-ld-rs/package.nix

0 → 100644
+54 −0
Original line number Diff line number Diff line 
{

  stdenv,

  fetchFromGitHub,

  nixosTests,

  rustPlatform,

  lib,

}:



rustPlatform.buildRustPackage {

  name = "nix-ld-rs";



  src = fetchFromGitHub {

    owner = "nix-community";

    repo = "nix-ld-rs";

    rev = "f7154a6aedba4917c8cc72b805b79444b5bfafca";

    sha256 = "sha256-tx6gO6NR4BnYVhoskyvQY9l6/8sK0HwoDHvsYcvIlgo=";

  };



  cargoHash = "sha256-4IDu5qAgF4Zq4GOsimuy8NiRCN9PXM+8oVzD2GO3QmM=";



  hardeningDisable = [ "stackprotector" ];



  NIX_SYSTEM = stdenv.system;

  RUSTC_BOOTSTRAP = "1";



  preCheck = ''

    export NIX_LD=${stdenv.cc.bintools.dynamicLinker}

  '';



  postInstall = ''

    mkdir -p $out/libexec

    ln -s $out/bin/nix-ld-rs $out/libexec/nix-ld-rs

    ln -s $out/bin/nix-ld-rs $out/libexec/nix-ld



    mkdir -p $out/nix-support



    ldpath=/${stdenv.hostPlatform.libDir}/$(basename ${stdenv.cc.bintools.dynamicLinker})

    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-rs

    EOF

  '';



  passthru.tests = nixosTests.nix-ld;



  meta = with lib; {

    description = "Run unpatched dynamic binaries on NixOS (rust version)";

    homepage = "https://github.com/nix-community/nix-ld-rs";

    license = licenses.mit;

    maintainers = with maintainers; [ mic92 ];

    platforms = platforms.linux;

  };

}

pkgs/os-specific/linux/nix-ld/default.nix→pkgs/by-name/ni/nix-ld/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec { 
  postInstall = ''

    mkdir -p $out/nix-support



    ldpath=/${stdenv.hostPlatform.libDir}/$(basename $(< ${stdenv.cc}/nix-support/dynamic-linker))

    ldpath=/${stdenv.hostPlatform.libDir}/$(basename ${stdenv.cc.bintools.dynamicLinker})

    echo "$ldpath" > $out/nix-support/ldpath

    mkdir -p $out/lib/tmpfiles.d/

    cat > $out/lib/tmpfiles.d/nix-ld.conf <<EOF
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec { 
    EOF

  '';



  passthru.tests.nix-ld = nixosTests.nix-ld;

  passthru.tests = nixosTests.nix-ld;



  meta = with lib; {

    description = "Run unpatched dynamic binaries on NixOS";

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -33422,8 +33422,6 @@ with pkgs; 














  nixos-shell = callPackage ../tools/virtualization/nixos-shell { };



























  nix-ld = callPackage ../os-specific/linux/nix-ld { };



























  noaa-apt = callPackage ../applications/radio/noaa-apt { };





























  node-problem-detector = callPackage ../applications/networking/cluster/node-problem-detector { };