cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

corrosion: 0.2.1 -> 0.3.0

Browse source 
https://github.com/corrosion-rs/corrosion/releases/tag/v0.2.2
https://github.com/corrosion-rs/corrosion/releases/tag/v0.3.0
This commit is contained in:
Robert Schütz 2022-11-08 12:11:41 -08:00 committed by Jonathan Ringer
parent 7cae9b3d7f
commit 702a4dd0e2
2 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/plasma-mobile/angelfish.nix
View file

@ -52,10 +52,6 @@ mkDerivation rec {
rust.rustc
]);
cmakeFlags = [
"-DRust_CARGO=${rustPlatform.rust.cargo}/bin/cargo"
];
buildInputs = [
kconfig
kcoreaddons

13
pkgs/development/tools/build-managers/corrosion/default.nix
View file

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "corrosion";
version = "0.2.1";
version = "0.3.0";
src = fetchFromGitHub {
owner = "corrosion-rs";
repo = "corrosion";
rev = "v${version}";
hash = "sha256-nJ4ercNykECDBqecuL8cdCl4DHgbgIUmbiFBG/jiOaA=";
hash = "sha256-HZdKnS0M8q4C42b7J93LZBXJycxYVahy2ywT6rISOzo=";
};
cargoRoot = "generator";
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
inherit src;
sourceRoot = "${src.name}/${cargoRoot}";
name = "${pname}-${version}";
hash = "sha256-4JVbHYlMOKztWPYW7tXQdvdNh/ygfpi0CY6Ly93VxsI=";
hash = "sha256-vrAK5BrMSC8FMLvtP0rxw4sHRU9ySbnrZM50oXMJV1Q=";
};
buildInputs = lib.optional stdenv.isDarwin libiconv;
@ -36,13 +36,6 @@ stdenv.mkDerivation rec {
rust.rustc
]);
cmakeFlags = [
"-DRust_CARGO=${rustPlatform.rust.cargo}/bin/cargo"
# tests cannot find cargo because Rust_CARGO is unset before tests
"-DCORROSION_BUILD_TESTS=OFF"
];
meta = with lib; {
description = "Tool for integrating Rust into an existing CMake project";
homepage = "https://github.com/corrosion-rs/corrosion";