parent
d4e758c5ac
commit
6efb930e18
@ -1,16 +0,0 @@ |
||||
{ pkgs, callPackage, CoreServices }: |
||||
|
||||
{ |
||||
rust-analyzer-unwrapped = callPackage ./generic.nix rec { |
||||
rev = "2021-04-05"; |
||||
version = "unstable-${rev}"; |
||||
sha256 = "sha256-ZDxy87F3uz8bTF1/2LIy5r4Nv/M3xe97F7mwJNEFcUs="; |
||||
cargoSha256 = "sha256-kDwdKa08E0h24lOOa7ALeNqHlMjMry/ru1qwCIyKmuE="; |
||||
|
||||
inherit CoreServices; |
||||
}; |
||||
|
||||
rust-analyzer = callPackage ./wrapper.nix {} { |
||||
unwrapped = pkgs.rust-analyzer-unwrapped; |
||||
}; |
||||
} |
@ -1,17 +1,15 @@ |
||||
{ lib, rustPlatform, runCommandNoCC, makeWrapper }: |
||||
|
||||
lib.makeOverridable ({ |
||||
unwrapped, |
||||
pname ? "rust-analyzer", |
||||
version ? unwrapped.version, |
||||
{ lib, rustPlatform, runCommand, makeWrapper, rust-analyzer-unwrapped |
||||
, pname ? "rust-analyzer" |
||||
, version ? rust-analyzer-unwrapped.version |
||||
# Use name from `RUST_SRC_PATH` |
||||
rustSrc ? rustPlatform.rustLibSrc, |
||||
}: runCommandNoCC "${pname}-${version}" { |
||||
, rustSrc ? rustPlatform.rustLibSrc |
||||
}: |
||||
runCommand "${pname}-${version}" { |
||||
inherit pname version; |
||||
inherit (unwrapped) src meta; |
||||
inherit (rust-analyzer-unwrapped) src meta; |
||||
nativeBuildInputs = [ makeWrapper ]; |
||||
} '' |
||||
mkdir -p $out/bin |
||||
makeWrapper ${unwrapped}/bin/rust-analyzer $out/bin/rust-analyzer \ |
||||
makeWrapper ${rust-analyzer-unwrapped}/bin/rust-analyzer $out/bin/rust-analyzer \ |
||||
--set-default RUST_SRC_PATH "${rustSrc}" |
||||
'') |
||||
'' |
||||
|
Loading…
Reference in new issue