From 47557e2984cac84711bf3aad6213dade0907116f Mon Sep 17 00:00:00 2001 From: Pamplemousse Date: Fri, 10 Sep 2021 16:37:56 +0200 Subject: [PATCH] nodesPackages.prisma: #135934 follow-up corrections --- pkgs/development/node-packages/default.nix | 10 +++++----- .../tools/database/prisma-engines/default.nix | 7 +++++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 5858dc0e7fd8..4df09839e6ee 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -282,11 +282,11 @@ let nativeBuildInputs = [ pkgs.makeWrapper ]; postInstall = with pkgs; '' wrapProgram "$out/bin/prisma" \ - --prefix PRISMA_MIGRATION_ENGINE_BINARY : "${prisma-engines}/bin/migration-engine" \ - --prefix PRISMA_QUERY_ENGINE_BINARY : "${prisma-engines}/bin/query-engine" \ - --prefix PRISMA_QUERY_ENGINE_LIBRARY : "${lib.getLib prisma-engines}/libquery_engine.so.node" - --prefix PRISMA_INTROSPECTION_ENGINE_BINARY : "${prisma-engines}/bin/introspection-engine" \ - --prefix PRISMA_FMT_BINARY : "${prisma-engines}/bin/prisma-fmt" + --set PRISMA_MIGRATION_ENGINE_BINARY ${prisma-engines}/bin/migration-engine \ + --set PRISMA_QUERY_ENGINE_BINARY ${prisma-engines}/bin/query-engine \ + --set PRISMA_QUERY_ENGINE_LIBRARY ${lib.getLib prisma-engines}/lib/libquery_engine.node \ + --set PRISMA_INTROSPECTION_ENGINE_BINARY ${prisma-engines}/bin/introspection-engine \ + --set PRISMA_FMT_BINARY ${prisma-engines}/bin/prisma-fmt ''; }; diff --git a/pkgs/development/tools/database/prisma-engines/default.nix b/pkgs/development/tools/database/prisma-engines/default.nix index 3f54428bb9b1..51369e094493 100644 --- a/pkgs/development/tools/database/prisma-engines/default.nix +++ b/pkgs/development/tools/database/prisma-engines/default.nix @@ -4,9 +4,12 @@ , pkg-config , protobuf , rustPlatform +, stdenv }: -rustPlatform.buildRustPackage rec { +let + node-api-lib = (if stdenv.isDarwin then "libquery_engine.dylib" else "libquery_engine.so"); +in rustPlatform.buildRustPackage rec { pname = "prisma-engines"; version = "2.30.2"; @@ -43,7 +46,7 @@ rustPlatform.buildRustPackage rec { ''; postInstall = '' - cp target/x86_64-unknown-linux-gnu/release/libquery_engine.so $out/lib/libquery_engine.so.node + mv $out/lib/${node-api-lib} $out/lib/libquery_engine.node ''; # Tests are long to compile