diff --git a/nix/default.nix b/nix/default.nix index 0e8b1cb..b5e538d 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -15,7 +15,7 @@ assert lib.assertMsg ((src.submodules or false) == true) let revision = lib.substring 0 8 (src.rev or "dirty"); libExt = if stdenv.isDarwin then "dylib" else "so"; - libchatPath = "${libchatDrv}/lib/liblogos_chat.${libExt}"; + libchatPath = "${libchatDrv}/lib/liblibchat.${libExt}"; in stdenv.mkDerivation { pname = "liblogoschat"; version = "0.1.0"; diff --git a/nix/libchat.nix b/nix/libchat.nix index 1d71ef8..1a7fc44 100644 --- a/nix/libchat.nix +++ b/nix/libchat.nix @@ -8,7 +8,7 @@ let rustc = rustToolchain; }; in rPlatform.buildRustPackage { - pname = "liblogos-chat"; + pname = "libchat"; version = "0.1.0"; src = ../vendor/libchat; @@ -29,13 +29,13 @@ in rPlatform.buildRustPackage { installPhase = '' runHook preInstall mkdir -p $out/lib - cp target/*/release/liblogos_chat.so $out/lib/ 2>/dev/null || true - cp target/*/release/liblogos_chat.dylib $out/lib/ 2>/dev/null || true - cp target/*/release/liblogos_chat.a $out/lib/ 2>/dev/null || true + cp target/*/release/liblibchat.so $out/lib/ 2>/dev/null || true + cp target/*/release/liblibchat.dylib $out/lib/ 2>/dev/null || true + cp target/*/release/liblibchat.a $out/lib/ 2>/dev/null || true # fallback: non-cross build path - cp target/release/liblogos_chat.so $out/lib/ 2>/dev/null || true - cp target/release/liblogos_chat.dylib $out/lib/ 2>/dev/null || true - cp target/release/liblogos_chat.a $out/lib/ 2>/dev/null || true + cp target/release/liblibchat.so $out/lib/ 2>/dev/null || true + cp target/release/liblibchat.dylib $out/lib/ 2>/dev/null || true + cp target/release/liblibchat.a $out/lib/ 2>/dev/null || true runHook postInstall ''; } diff --git a/vendor/libchat b/vendor/libchat index eb94138..960bb19 160000 --- a/vendor/libchat +++ b/vendor/libchat @@ -1 +1 @@ -Subproject commit eb941387dfba1e110e55e47c4e1374c6a6239b0c +Subproject commit 960bb195a13657a09fa2df66262b3b2ced738f30