Merge pull request #108022 from siraben/cmake-native-build-inputs

[staging] treewide: cmake buildInputs to nativeBuildInputs, minor cleanups
2021-01-01 10:54:25 +01:00
parent 645e99f891 fcbc6c84e5
commit 3f08495212
212 changed files with 612 additions and 635 deletions
@@ -13,8 +13,9 @@ rustPlatform.buildRustPackage rec {
    sha256 = "06xkhlfix0h6di6cnvc4blbj3mjy90scbh89dvywbx16wjlc79pf";
  };

-  buildInputs = [ cmake libzip gnupg ] ++
-    (if stdenv.isDarwin then [ libiconv CoreFoundation Security ] else []);
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ libzip gnupg ]
+    ++ (stdenv.lib.optionals stdenv.isDarwin [ libiconv CoreFoundation Security ]);

  preCheck = ''
    export HOME=$(mktemp -d)