47557e2 · typeable/nixpkgs

git.iko.soy/typeable/nixpkgs

nodesPackages.prisma: #135934 follow-up corrections

commit47557e2984cac84711bf3aad6213dade0907116f authorPamplemousse <xav.maso@gmail.com> dateFri 10 Sep 2021, 16:37 (5 years ago) parentd047d33

2 files changed+10−7

unifiedsplit

pkgs/development/node-packages/default.nix+5−5

@@ -282,11 +282,11 @@ let

282282 nativeBuildInputs = [ pkgs.makeWrapper ];

283283 postInstall = with pkgs; ''

284284 wrapProgram "$out/bin/prisma" \

285− --prefix PRISMA_MIGRATION_ENGINE_BINARY : "${prisma-engines}/bin/migration-engine" \

286− --prefix PRISMA_QUERY_ENGINE_BINARY : "${prisma-engines}/bin/query-engine" \

287− --prefix PRISMA_QUERY_ENGINE_LIBRARY : "${lib.getLib prisma-engines}/libquery_engine.so.node"

288− --prefix PRISMA_INTROSPECTION_ENGINE_BINARY : "${prisma-engines}/bin/introspection-engine" \

289− --prefix PRISMA_FMT_BINARY : "${prisma-engines}/bin/prisma-fmt"

285+ --set PRISMA_MIGRATION_ENGINE_BINARY ${prisma-engines}/bin/migration-engine \

286+ --set PRISMA_QUERY_ENGINE_BINARY ${prisma-engines}/bin/query-engine \

287+ --set PRISMA_QUERY_ENGINE_LIBRARY ${lib.getLib prisma-engines}/lib/libquery_engine.node \

288+ --set PRISMA_INTROSPECTION_ENGINE_BINARY ${prisma-engines}/bin/introspection-engine \

289+ --set PRISMA_FMT_BINARY ${prisma-engines}/bin/prisma-fmt

290290 '';

291291 };

292292

pkgs/development/tools/database/prisma-engines/default.nix+5−2

@@ -4,9 +4,12 @@

44, pkg-config

55, protobuf

66, rustPlatform

7+, stdenv

78}:

9−rustPlatform.buildRustPackage rec {

10+let

11+ node-api-lib = (if stdenv.isDarwin then "libquery_engine.dylib" else "libquery_engine.so");

12+in rustPlatform.buildRustPackage rec {

1013 pname = "prisma-engines";

1114 version = "2.30.2";

1215

@@ -43,7 +46,7 @@ rustPlatform.buildRustPackage rec {

4346 '';

4447

4548 postInstall = ''

46− cp target/x86_64-unknown-linux-gnu/release/libquery_engine.so $out/lib/libquery_engine.so.node

49+ mv $out/lib/${node-api-lib} $out/lib/libquery_engine.node

4750 '';

4851

4952 # Tests are long to compile