Skip to content

Commit e37885b

Browse files
danieldkDaniël de Kok
authored andcommitted
Sync Nix dependencies with Cargo.lock
1 parent 4892b13 commit e37885b

File tree

4 files changed

+1893
-3601
lines changed

4 files changed

+1893
-3601
lines changed

default.nix

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414

1515
let
1616
rustNightly = callPackage ./nix/rust-nightly.nix {};
17-
in ((callPackage ./nix/finalfusion-python.nix {}).finalfusion_python {}).override {
17+
cargo_nix = callPackage ./nix/Cargo.nix {};
18+
in cargo_nix.rootCrate.build.override {
1819
release = releaseBuild;
1920
rust = rustNightly;
2021

@@ -23,6 +24,8 @@ in ((callPackage ./nix/finalfusion-python.nix {}).finalfusion_python {}).overrid
2324
pname = "finalfusion-python";
2425
name = "${pname}-${attr.version}";
2526

27+
type = [ "cdylib" ];
28+
2629
src = nix-gitignore.gitignoreSource [ ".git/" "*.nix" "/nix" ] ./.;
2730

2831
buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.Security;
@@ -38,7 +41,7 @@ in ((callPackage ./nix/finalfusion-python.nix {}).finalfusion_python {}).overrid
3841
sharedLibrary = stdenv.hostPlatform.extensions.sharedLibrary;
3942
in ''
4043
mkdir -p "$out/${sitePackages}"
41-
cp target/lib/libfinalfusion-*${sharedLibrary} \
44+
cp target/lib/libfinalfusion_python*${sharedLibrary} \
4245
"$out/${sitePackages}/finalfusion.so"
4346
export PYTHONPATH="$out/${sitePackages}:$PYTHONPATH"
4447
'';

0 commit comments

Comments
 (0)