dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #78188 from andir/buildRustCrate-support-rlib

Browse Source 
buildRustCrate: support `rlib` dependency type
This commit is contained in:
Andreas Rammhold 2020-01-28 13:47:57 +01:00 committed by GitHub
commit cd27940df0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/build-support/rust/build-rust-crate/default.nix
View File

@ -23,7 +23,7 @@ let
lib.strings.replaceStrings ["-"] ["_"] crateRenames.${dep.crateName} lib.strings.replaceStrings ["-"] ["_"] crateRenames.${dep.crateName}
else else
extern; extern;
in (if lib.any (x: x == "lib") dep.crateType then in (if lib.any (x: x == "lib" || x == "rlib") dep.crateType then
" --extern ${name}=${dep.lib}/lib/lib${extern}-${dep.metadata}.rlib" " --extern ${name}=${dep.lib}/lib/lib${extern}-${dep.metadata}.rlib"
else else
" --extern ${name}=${dep.lib}/lib/lib${extern}-${dep.metadata}${stdenv.hostPlatform.extensions.sharedLibrary}") " --extern ${name}=${dep.lib}/lib/lib${extern}-${dep.metadata}${stdenv.hostPlatform.extensions.sharedLibrary}")

35
pkgs/build-support/rust/build-rust-crate/test/default.nix
View File

@ -1,17 +1,17 @@
{ lib, buildRustCrate, runCommand, writeTextFile, symlinkJoin, callPackage, releaseTools }: { lib, buildRustCrate, runCommand, writeTextFile, symlinkJoin, callPackage, releaseTools }:
let let
mkCrate = args: let mkCrate = args: let
p = { p = {
crateName = "nixtestcrate"; crateName = "nixtestcrate";
version = "0.1.0"; version = "0.1.0";
authors = [ "Test <test@example.com>" ]; authors = [ "Test <test@example.com>" ];
} // args; } // args;
in buildRustCrate p; in buildRustCrate p;
mkFile = destination: text: writeTextFile { mkFile = destination: text: writeTextFile {
name = "src"; name = "src";
destination = "/${destination}"; destination = "/${destination}";
inherit text; inherit text;
}; };
mkBin = name: mkFile name '' mkBin = name: mkFile name ''
@ -185,7 +185,20 @@ let
"test tests_bar ... ok" "test tests_bar ... ok"
]; ];
}; };
linkAgainstRlibCrate = {
crateName = "foo";
src = mkFile "src/main.rs" ''
extern crate somerlib;
fn main() {}
'';
dependencies = [
(mkCrate {
crateName = "somerlib";
type = [ "rlib" ];
src = mkLib "src/lib.rs";
})
];
};
}; };
brotliCrates = (callPackage ./brotli-crates.nix {}); brotliCrates = (callPackage ./brotli-crates.nix {});
in lib.mapAttrs (key: value: mkTest (value // lib.optionalAttrs (!value?crateName) { crateName = key; })) cases // { in lib.mapAttrs (key: value: mkTest (value // lib.optionalAttrs (!value?crateName) { crateName = key; })) cases // {