commit 9bf4ec690947311dd0b080bb8d86a3019d5f4f24 · pyrox.dev/nixpkgs

+60 -2

nixos/modules/programs/nix-ld.nix

···

       1
       1
        
       { pkgs, lib, config, ... }:

     

       2
       2
       +
       let

     

       3
       3
       +
         cfg = config.programs.nix-ld;

     

       4
       4
       +
       

     

       5
       5
       +
         # TODO make glibc here configureable?

     

       6
       6
       +
         nix-ld-so = pkgs.runCommand "ld.so" {} ''

     

       7
       7
       +
           ln -s "$(cat '${pkgs.stdenv.cc}/nix-support/dynamic-linker')" $out

     

       8
       8
       +
         '';

     

       9
       9
       +
       

     

       10
       10
       +
         nix-ld-libraries = pkgs.buildEnv {

     

       11
       11
       +
           name = "lb-library-path";

     

       12
       12
       +
           pathsToLink = [ "/lib" ];

     

       13
       13
       +
           paths = map lib.getLib cfg.libraries;

     

       14
       14
       +
           extraPrefix = "/share/nix-ld";

     

       15
       15
       +
           ignoreCollisions = true;

     

       16
       16
       +
         };

     

       17
       17
       +
       

     

       18
       18
       +
         # We currently take all libraries from systemd and nix as the default.

     

       19
       19
       +
         # Is there a better list?

     

       20
       20
       +
         baseLibraries = with pkgs; [

     

       21
       21
       +
           zlib

     

       22
       22
       +
           zstd

     

       23
       23
       +
           stdenv.cc.cc

     

       24
       24
       +
           curl

     

       25
       25
       +
           openssl

     

       26
       26
       +
           attr

     

       27
       27
       +
           libssh

     

       28
       28
       +
           bzip2

     

       29
       29
       +
           libxml2

     

       30
       30
       +
           acl

     

       31
       31
       +
           libsodium

     

       32
       32
       +
           util-linux

     

       33
       33
       +
           xz

     

       34
       34
       +
           systemd

     

       35
       35
       +
         ];

     

       36
       36
       +
       in

     

       2
       37
        
       {

     

       3
       38
        
         meta.maintainers = [ lib.maintainers.mic92 ];

     

       4
       39
        
         options = {

     

       5
       5
       -
           programs.nix-ld.enable = lib.mkEnableOption (lib.mdDoc ''nix-ld, Documentation: <https://github.com/Mic92/nix-ld>'');

     

       40
       40
       +
           programs.nix-ld = {

     

       41
       41
       +
             enable = lib.mkEnableOption (lib.mdDoc ''nix-ld, Documentation: <https://github.com/Mic92/nix-ld>'');

     

       42
       42
       +
             package = lib.mkOption {

     

       43
       43
       +
               type = lib.types.package;

     

       44
       44
       +
               description = lib.mdDoc "Which package to use for the nix-ld.";

     

       45
       45
       +
               default = pkgs.nix-ld;

     

       46
       46
       +
               defaultText = lib.mdDoc "pkgs.nix-ld";

     

       47
       47
       +
             };

     

       48
       48
       +
             libraries = lib.mkOption {

     

       49
       49
       +
               type = lib.types.listOf lib.types.package;

     

       50
       50
       +
               description = lib.mdDoc "Libraries that automatically become available to all programs. The default set includes common libraries.";

     

       51
       51
       +
               default = baseLibraries;

     

       52
       52
       +
               defaultText = lib.mdDoc "baseLibraries";

     

       53
       53
       +
             };

     

       54
       54
       +
           };

     

       6
       55
        
         };

     

       7
       56
        
         config = lib.mkIf config.programs.nix-ld.enable {

     

       8
       8
       -
           systemd.tmpfiles.packages = [ pkgs.nix-ld ];

     

       57
       57
       +
           systemd.tmpfiles.packages = [ cfg.package ];

     

       58
       58
       +
       

     

       59
       59
       +
           environment.systemPackages = [ nix-ld-libraries ];

     

       60
       60
       +
       

     

       61
       61
       +
           environment.pathsToLink = [ "/share/nix-ld" ];

     

       62
       62
       +
       

     

       63
       63
       +
           environment.variables = {

     

       64
       64
       +
             NIX_LD = toString nix-ld-so;

     

       65
       65
       +
             NIX_LD_LIBRARY_PATH = "/run/current-system/sw/share/nix-ld/lib";

     

       66
       66
       +
           };

     

       9
       67
        
         };

     

       10
       68
        
       }

+1 -4

nixos/tests/nix-ld.nix

···

       12
       12
        
         };

     

       13
       13
        
         testScript = ''

     

       14
       14
        
           start_all()

     

       15
       15
       -
           path = "${pkgs.stdenv.cc}/nix-support/dynamic-linker"

     

       16
       16
       -
           with open(path) as f:

     

       17
       17
       -
               real_ld = f.read().strip()

     

       18
       18
       -
           machine.succeed(f"NIX_LD={real_ld} hello")

     

       15
       15
       +
           machine.succeed("hello")

     

       19
       16
        
        '';

     

       20
       17
        
       })

+2 -2

pkgs/os-specific/linux/nix-ld/default.nix

···

       12
       12
        
       in

     

       13
       13
        
       stdenv.mkDerivation rec {

     

       14
       14
        
         pname = "nix-ld";

     

       15
       15
       -
         version = "1.0.2";

     

       15
       15
       +
         version = "1.0.3";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchFromGitHub {

     

       18
       18
        
           owner = "mic92";

     

       19
       19
        
           repo = "nix-ld";

     

       20
       20
        
           rev = version;

     

       21
       21
       -
           sha256 = "sha256-DlWU5i/MykqWgB9vstYbECy3e+XagXWCxi+XDJNey0s=";

     

       21
       21
       +
           sha256 = "sha256-KmnT8YfU/KI4VxBlFMUltlAVLNvF7fTEQEsp41ZUHlA=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         doCheck = true;