Commit d613d20a authored by David McFarland's avatar David McFarland
Browse files

treewide: fix nix-env eval in cross

parent c6277c38

pkgs/build-support/cc-wrapper/default.nix

+6 −2
Original line number Diff line number Diff line
@@ -125,8 +125,12 @@ let 
  libc_bin = optionalString (libc != null) (getBin libc);

  libc_dev = optionalString (libc != null) (getDev libc);

  libc_lib = optionalString (libc != null) (getLib libc);

  cc_solib = getLib cc + optionalString (targetPlatform != hostPlatform) "/${targetPlatform.config}";

  cc_bin = getBin cc + optionalString (targetPlatform != hostPlatform) "/${targetPlatform.config}";

  cc_solib =

    optionalString (!nativeTools) (getLib cc)

    + optionalString (targetPlatform != hostPlatform) "/${targetPlatform.config}";

  cc_bin =

    optionalString (!nativeTools) (getBin cc)

    + optionalString (targetPlatform != hostPlatform) "/${targetPlatform.config}";



  # The wrapper scripts use 'cat' and 'grep', so we may need coreutils.

  coreutils_bin = optionalString (!nativeTools) (getBin coreutils);

pkgs/by-name/ai/aircrack-ng/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec { 
      ethtool

      pciutils

    ]

    ++ lib.optional (stdenv.hostPlatform.isCygwin && stdenv.hostPlatform.isClang) libiconv

    ++ lib.optional (stdenv.hostPlatform.isCygwin && stdenv.cc.isClang) libiconv

    ++ lib.optional enableAirolib sqlite

    ++ lib.optional enableRegex pcre2

    ++ lib.optional useAirpcap airpcap-sdk;

pkgs/by-name/am/amazon-ssm-agent/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
  darwin,

  fetchFromGitHub,

  coreutils,

  net-tools,

  unixtools,

  util-linux,

  stdenv,

  dmidecode,
@@ -90,7 +90,7 @@ buildGoModule rec { 


    substituteInPlace agent/platform/platform_unix.go \

      --replace-fail "/usr/bin/uname" "${coreutils}/bin/uname" \

      --replace-fail '"/bin", "hostname"' '"${net-tools}/bin/hostname"' \

      --replace-fail '"/bin", "hostname"' '"${unixtools.hostname}/bin/hostname"' \

      --replace-fail '"lsb_release"' '"${fake-lsb-release}/bin/lsb_release"'



    substituteInPlace agent/session/shell/shell_unix.go \

pkgs/by-name/ar/argo-workflows/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ buildGoModule rec { 
        if (stdenv.buildPlatform == stdenv.hostPlatform) then

          "$out/bin/argo"

        else

          "${pkgsBuildBuild.argo}/bin/argo"

          "${pkgsBuildBuild.argo-workflows}/bin/argo"

      } completion $shell > argo.$shell

      installShellCompletion argo.$shell

    done

pkgs/by-name/hy/hydra/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ let 
        UUID4Tiny

        XMLSimple

        YAML

        (nix.libs.nix-perl-bindings or nix.perl-bindings)

        (nix.libs.nix-perl-bindings or nix.perl-bindings or null)

        git

      ];

  };