Merge pull request #263939 from hacker1024/fix/dart-fod-wrapper

authored by Maciej Krüger and committed by GitHub f67b20ca 278bfe24

+10 -6
+10 -6
pkgs/build-support/dart/build-dart-application/default.nix
··· 1 - { lib, stdenv, callPackage, fetchDartDeps, runCommand, writeText, dartHooks, makeWrapper, dart, cacert, nodejs, darwin, jq }: 1 + { lib, stdenv, callPackage, fetchDartDeps, writeText, symlinkJoin, dartHooks, makeWrapper, dart, cacert, nodejs, darwin, jq }: 2 2 3 3 { sdkSetupScript ? "" 4 4 , pubGetScript ? "dart pub get" ··· 36 36 37 37 let 38 38 dartDeps = (fetchDartDeps.override { 39 - dart = runCommand "dart-fod" { nativeBuildInputs = [ makeWrapper ]; } '' 40 - mkdir -p "$out/bin" 41 - makeWrapper "${dart}/bin/dart" "$out/bin/dart" \ 42 - --add-flags "--root-certs-file=${cacert}/etc/ssl/certs/ca-bundle.crt" 43 - ''; 39 + dart = symlinkJoin { 40 + name = "dart-fod"; 41 + paths = [ dart ]; 42 + nativeBuildInputs = [ makeWrapper ]; 43 + postBuild = '' 44 + wrapProgram "$out/bin/dart" \ 45 + --add-flags "--root-certs-file=${cacert}/etc/ssl/certs/ca-bundle.crt" 46 + ''; 47 + }; 44 48 }) { 45 49 buildDrvArgs = args; 46 50 inherit sdkSetupScript pubGetScript vendorHash pubspecLockFile;