diff options
| author | Maciej Krüger <mkg20001@gmail.com> | 2023-11-17 05:00:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-17 05:00:37 +0100 |
| commit | f67b20cad6691a5844016876fb4e77082ad7ff34 (patch) | |
| tree | 602c5efebbc4c7b0936c27921c3f0dab9110aa9f | |
| parent | 278bfe24a7459212bbc74abc80d593472ba7fa56 (diff) | |
| parent | bc82281e01e50c5049059530e99635934be78da6 (diff) | |
| download | nixpkgs-f67b20cad6691a5844016876fb4e77082ad7ff34.tar nixpkgs-f67b20cad6691a5844016876fb4e77082ad7ff34.tar.gz nixpkgs-f67b20cad6691a5844016876fb4e77082ad7ff34.tar.bz2 nixpkgs-f67b20cad6691a5844016876fb4e77082ad7ff34.tar.lz nixpkgs-f67b20cad6691a5844016876fb4e77082ad7ff34.tar.xz nixpkgs-f67b20cad6691a5844016876fb4e77082ad7ff34.tar.zst nixpkgs-f67b20cad6691a5844016876fb4e77082ad7ff34.zip | |
Merge pull request #263939 from hacker1024/fix/dart-fod-wrapper
| -rw-r--r-- | pkgs/build-support/dart/build-dart-application/default.nix | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/build-support/dart/build-dart-application/default.nix b/pkgs/build-support/dart/build-dart-application/default.nix index 76328e5645f..1a98f98fb8e 100644 --- a/pkgs/build-support/dart/build-dart-application/default.nix +++ b/pkgs/build-support/dart/build-dart-application/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, fetchDartDeps, runCommand, writeText, dartHooks, makeWrapper, dart, cacert, nodejs, darwin, jq }: +{ lib, stdenv, callPackage, fetchDartDeps, writeText, symlinkJoin, dartHooks, makeWrapper, dart, cacert, nodejs, darwin, jq }: { sdkSetupScript ? "" , pubGetScript ? "dart pub get" @@ -36,11 +36,15 @@ let dartDeps = (fetchDartDeps.override { - dart = runCommand "dart-fod" { nativeBuildInputs = [ makeWrapper ]; } '' - mkdir -p "$out/bin" - makeWrapper "${dart}/bin/dart" "$out/bin/dart" \ - --add-flags "--root-certs-file=${cacert}/etc/ssl/certs/ca-bundle.crt" - ''; + dart = symlinkJoin { + name = "dart-fod"; + paths = [ dart ]; + nativeBuildInputs = [ makeWrapper ]; + postBuild = '' + wrapProgram "$out/bin/dart" \ + --add-flags "--root-certs-file=${cacert}/etc/ssl/certs/ca-bundle.crt" + ''; + }; }) { buildDrvArgs = args; inherit sdkSetupScript pubGetScript vendorHash pubspecLockFile; |