Unverified Commit 31f7f3fc authored by jade's avatar jade Committed by GitHub
Browse files

nixForLinking: init (#384099)

parents 5084af75 f4d32e02

pkgs/build-support/node/fetch-yarn-deps/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
  makeSetupHook,

  cacert,

  callPackage,

  nix,

  nixForLinking,

}:



let
@@ -55,7 +55,7 @@ in 
          lib.makeBinPath [

            coreutils

            nix-prefetch-git

            nix

            nixForLinking

          ]

        }

pkgs/by-name/at/attic-client/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
  lib,

  rustPlatform,

  fetchFromGitHub,

  nix,

  nixForLinking,

  nixosTests,

  boost,

  pkg-config,
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage { 


  buildInputs =

    [

      nix

      nixForLinking

      boost

    ]

    ++ lib.optionals stdenv.hostPlatform.isDarwin (
@@ -44,7 +44,7 @@ rustPlatform.buildRustPackage { 
  useFetchCargoVendor = true;



  ATTIC_DISTRIBUTOR = "nixpkgs";

  NIX_INCLUDE_PATH = "${lib.getDev nix}/include";

  NIX_INCLUDE_PATH = "${lib.getDev nixForLinking}/include";



  # Attic interacts with Nix directly and its tests require trusted-user access

  # to nix-daemon to import NARs, which is not possible in the build sandbox.

pkgs/by-name/nu/nurl/package.nix

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

  gitMinimal,

  mercurial,

  nix,

  nixForLinking,

}:



rustPlatform.buildRustPackage rec {
@@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { 
        lib.makeBinPath [

          gitMinimal

          mercurial

          nix

          nixForLinking

        ]

      }

    installManPage artifacts/nurl.1

pkgs/development/tools/language-servers/nixd/default.nix

+5 −5
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
  llvmPackages,

  meson,

  ninja,

  nix,

  nixForLinking,

  nix-update-script,

  nixd,

  nixf,
@@ -101,12 +101,12 @@ in 
      ];



      buildInputs = [

        nix

        nixForLinking

        gtest

        boost

      ];



      env.CXXFLAGS = "-include ${nix.dev}/include/nix/config.h";

      env.CXXFLAGS = "-include ${nixForLinking.dev}/include/nix/config.h";



      passthru.tests.pkg-config = testers.hasPkgConfigModules {

        package = nixt;
@@ -127,7 +127,7 @@ in 
      sourceRoot = "${common.src.name}/nixd";



      buildInputs = [

        nix

        nixForLinking

        nixf

        nixt

        llvmPackages.llvm
@@ -137,7 +137,7 @@ in 


      nativeBuildInputs = common.nativeBuildInputs ++ [ cmake ];



      env.CXXFLAGS = "-include ${nix.dev}/include/nix/config.h";

      env.CXXFLAGS = "-include ${nixForLinking.dev}/include/nix/config.h";



      # See https://github.com/nix-community/nixd/issues/519

      doCheck = false;

pkgs/tools/package-management/nix-du/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
  stdenv,

  fetchFromGitHub,

  rustPlatform,

  nix,

  nixForLinking,

  nlohmann_json,

  boost,

  graphviz,
@@ -27,13 +27,13 @@ rustPlatform.buildRustPackage rec { 


  doCheck = true;

  nativeCheckInputs = [

    nix

    nixForLinking

    graphviz

  ];



  buildInputs = [

    boost

    nix

    nixForLinking

    nlohmann_json

  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ];