Merge pull request #56 from Mic92/joerg-ci

use pkgs.stdenv.cc.bintools.dynamicLinker for ld.so path

Author: mergify[bot]

modules/nix-ld.nix

@@ -8,7 +8,7 @@ let
     paths = map lib.getLib cfg.libraries;
     # TODO make glibc here configurable?
     postBuild = ''
-      ln -s "$(cat '${pkgs.stdenv.cc}/nix-support/dynamic-linker')" $out/share/nix-ld/lib/ld.so
+      ln -s ${pkgs.stdenv.cc.bintools.dynamicLinker} $out/share/nix-ld/lib/ld.so
     '';
     extraPrefix = "/share/nix-ld";
     ignoreCollisions = true;

nix-ld.nix

@@ -3,15 +3,14 @@
   stdenv,
   meson,
   ninja,
-  overrideCC,
   path,
   pkgs,
 }: let
   libDir = if builtins.elem stdenv.system [ "x86_64-linux" "mips64-linux" "powerpc64le-linux" ]
            then "/lib64"
            else "/lib";
 in
-  stdenv.mkDerivation rec {
+  stdenv.mkDerivation {
     name = "nix-ld";
     src = ./.;
 
@@ -30,7 +29,7 @@ in
     postInstall = ''
       mkdir -p $out/nix-support
 
-      ldpath=${libDir}/$(basename $(< ${stdenv.cc}/nix-support/dynamic-linker))
+      ldpath=${libDir}/$(basename ${pkgs.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