Merge pull request #7186 from arno01/checksecfix

checksec: use binutils instead of elfutils

+6 -4
+6 -4
pkgs/os-specific/linux/checksec/default.nix
··· 1 - { stdenv, fetchurl, file, findutils, elfutils, glibc }: 2 3 stdenv.mkDerivation rec { 4 name = "checksec-${version}"; ··· 25 substituteInPlace $out/bin/checksec --replace find ${findutils}/bin/find 26 substituteInPlace $out/bin/checksec --replace "file $" "${file}/bin/file $" 27 substituteInPlace $out/bin/checksec --replace "xargs file" "xargs ${file}/bin/file" 28 - substituteInPlace $out/bin/checksec --replace " readelf -" " ${elfutils}/bin/readelf -" 29 - substituteInPlace $out/bin/checksec --replace "(readelf -" "(${elfutils}/bin/readelf -" 30 - substituteInPlace $out/bin/checksec --replace "command_exists readelf" "command_exists ${elfutils}/bin/readelf" 31 ''; 32 33 phases = "unpackPhase patchPhase installPhase";
··· 1 + { stdenv, fetchurl, file, findutils, binutils, glibc, procps, coreutils }: 2 3 stdenv.mkDerivation rec { 4 name = "checksec-${version}"; ··· 25 substituteInPlace $out/bin/checksec --replace find ${findutils}/bin/find 26 substituteInPlace $out/bin/checksec --replace "file $" "${file}/bin/file $" 27 substituteInPlace $out/bin/checksec --replace "xargs file" "xargs ${file}/bin/file" 28 + substituteInPlace $out/bin/checksec --replace " readelf -" " ${binutils}/bin/readelf -" 29 + substituteInPlace $out/bin/checksec --replace "(readelf -" "(${binutils}/bin/readelf -" 30 + substituteInPlace $out/bin/checksec --replace "command_exists readelf" "command_exists ${binutils}/bin/readelf" 31 + substituteInPlace $out/bin/checksec --replace "/sbin/sysctl -" "${procps}/sbin/sysctl -" 32 + substituteInPlace $out/bin/checksec --replace "/usr/bin/id -" "${coreutils}/bin/id -" 33 ''; 34 35 phases = "unpackPhase patchPhase installPhase";