Unverified Commit f27d72de authored by Ben Siraphob's avatar Ben Siraphob Committed by GitHub
Browse files

treewide: move cmake into nativeBuildInputs (#461718)

parents d82a5e5e c1c3d13a

pkgs/by-name/du/dune3d/package.nix

+3 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: { 
  };



  nativeBuildInputs = [

    cmake

    gobject-introspection

    meson

    ninja
@@ -46,8 +47,9 @@ stdenv.mkDerivation (finalAttrs: { 
  ]

  ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;



  dontUseCmakeConfigure = true;



  buildInputs = [

    cmake

    eigen

    glm

    gtkmm4

pkgs/by-name/dy/dynein/package.nix

+4 −2
Original line number Diff line number Diff line
@@ -23,11 +23,13 @@ rustPlatform.buildRustPackage rec { 


  cargoHash = "sha256-PA7Hvn+vYBD80thkIamwOhw4lJWAmU/TQBnwJro4r7c=";



  nativeBuildInputs = [ pkg-config ];

  nativeBuildInputs = [

    cmake

    pkg-config

  ];



  buildInputs = [

    openssl

    cmake

  ];



  preBuild = ''

pkgs/by-name/en/enzyme/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ llvmPackages.stdenv.mkDerivation rec { 
  llvm = llvmPackages.llvm;

  clang = llvmPackages.clang-unwrapped;



  nativeBuildInputs = [ cmake ];

  buildInputs = [

    cmake

    git

    llvm

    clang

pkgs/by-name/mi/mission-center/package.nix

+1 −5
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
  fetchFromGitLab,

  rustPlatform,

  symlinkJoin,



  # nativeBuildInputs

  blueprint-compiler,

  cargo,
@@ -18,7 +17,6 @@ 
  python3,

  rustc,

  wrapGAppsHook4,



  # buildInputs

  appstream-glib,

  cairo,
@@ -37,12 +35,10 @@ 
  sqlite,

  udev,

  wayland,



  # magpie wrapper

  addDriverRunpath,

  libGL,

  vulkan-loader,



  versionCheckHook,

}:
@@ -129,6 +125,7 @@ stdenv.mkDerivation (finalAttrs: { 
  };



  nativeBuildInputs = [

    cmake

    addDriverRunpath

    blueprint-compiler

    cargo
@@ -149,7 +146,6 @@ stdenv.mkDerivation (finalAttrs: { 
    appstream-glib

    blueprint-compiler

    cairo

    cmake

    dbus

    desktop-file-utils

    gdk-pixbuf

pkgs/by-name/pa/papilo/package.nix

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ stdenv.mkDerivation (finalAttrs: { 


  buildInputs = [

    boost

    cmake

    onetbb

  ];