the-distro/ofborg
2
0
Fork 1
Code Issues 1 Pull requests 1 Packages Projects Releases Wiki Activity

work around carnix workspace issue

Browse source 
Carnix doesn't properly handle includes for workspace members, this
works around the issue by specifying what should be generated directly
in Cargo.toml.

https://nest.pijul.com/pmeunier/carnix/discussions/46
This commit is contained in:
Daiderd Jordan 2020-04-25 13:51:14 +02:00
parent 0139cd5621
commit 96639e9d7e
No known key found for this signature in database
GPG key ID: D02435D05B810C96
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Cargo.nix
View file

@ -112,7 +112,7 @@ rec {
version = "0.1.8"; version = "0.1.8";
authors = [ "Graham Christensen <graham@grahamc.com>" ]; authors = [ "Graham Christensen <graham@grahamc.com>" ];
edition = "2018"; edition = "2018";
src = include [ "Cargo.toml" "src" "test-srcs" "build.rs" ] ./.; src = include [ "Cargo.toml" "ofborg" ] ./.;
workspace_member = "ofborg"; workspace_member = "ofborg";
build = "build.rs"; build = "build.rs";
dependencies = mapFeatures features ([ dependencies = mapFeatures features ([
@ -192,7 +192,7 @@ rec {
version = "0.1.0"; version = "0.1.0";
authors = [ "Daiderd Jordan <daiderd@gmail.com>" ]; authors = [ "Daiderd Jordan <daiderd@gmail.com>" ];
edition = "2018"; edition = "2018";
src = include [ "Cargo.toml" " ofborg-simple-build" ] ./.; src = include [ "Cargo.toml" "ofborg-simple-build" ] ./.;
workspace_member = "ofborg-simple-build"; workspace_member = "ofborg-simple-build";
dependencies = mapFeatures features ([ dependencies = mapFeatures features ([
(cratesIO.crates."log"."${deps."ofborg_simple_build"."0.1.0"."log"}" deps) (cratesIO.crates."log"."${deps."ofborg_simple_build"."0.1.0"."log"}" deps)

1
ofborg-simple-build/Cargo.toml
View file

@ -2,6 +2,7 @@
name = "ofborg-simple-build" name = "ofborg-simple-build"
version = "0.1.0" version = "0.1.0"
authors = ["Daiderd Jordan <daiderd@gmail.com>"] authors = ["Daiderd Jordan <daiderd@gmail.com>"]
include = ["Cargo.toml", "ofborg-simple-build"] # TODO remove when carnix is fixed
edition = "2018" edition = "2018"
[dependencies] [dependencies]

2
ofborg/Cargo.toml
View file

@ -2,7 +2,7 @@
name = "ofborg" name = "ofborg"
version = "0.1.8" version = "0.1.8"
authors = ["Graham Christensen <graham@grahamc.com>"] authors = ["Graham Christensen <graham@grahamc.com>"]
include = ["Cargo.toml", "src", "test-srcs", "build.rs"] include = ["Cargo.toml", "ofborg"] # TODO remove when carnix is fixed
build = "build.rs" build = "build.rs"
edition = "2018" edition = "2018"