diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-02-10 19:31:20 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-03-22 21:18:09 +0000 |
| commit | 07bae67bd84fc97b397f8499fa5573291d50c9d8 (patch) | |
| tree | c88c6ed8dc88e51d50dc502fd54ed3eb0a6a93c8 /pkgs/development/tools/build-managers/meson/setup-hook.sh | |
| parent | 6ad38730ae47fe7669ab9307cc5526080074cbe4 (diff) | |
| download | nixpkgs-07bae67bd84fc97b397f8499fa5573291d50c9d8.tar nixpkgs-07bae67bd84fc97b397f8499fa5573291d50c9d8.tar.gz nixpkgs-07bae67bd84fc97b397f8499fa5573291d50c9d8.tar.bz2 nixpkgs-07bae67bd84fc97b397f8499fa5573291d50c9d8.tar.lz nixpkgs-07bae67bd84fc97b397f8499fa5573291d50c9d8.tar.xz nixpkgs-07bae67bd84fc97b397f8499fa5573291d50c9d8.tar.zst nixpkgs-07bae67bd84fc97b397f8499fa5573291d50c9d8.zip | |
meson: pull cross-file logic out of stdenv
Since Meson isn't part of stdenv, it doesn't really make sense for stdenv to handle mesonFlags. And putting it in stdenv imposes some limitations — we can't depend on e.g. rust.toRustTargetSpec, which we'll need to introduce Rust support in the cross file.
Diffstat (limited to 'pkgs/development/tools/build-managers/meson/setup-hook.sh')
| -rw-r--r-- | pkgs/development/tools/build-managers/meson/setup-hook.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/tools/build-managers/meson/setup-hook.sh b/pkgs/development/tools/build-managers/meson/setup-hook.sh index 3d946fcffd5..6a7087174e5 100644 --- a/pkgs/development/tools/build-managers/meson/setup-hook.sh +++ b/pkgs/development/tools/build-managers/meson/setup-hook.sh @@ -6,7 +6,7 @@ mesonConfigurePhase() { fi # See multiple-outputs.sh and meson’s coredata.py - mesonFlags="\ + mesonFlags="@crossFlags@ \ --libdir=${!outputLib}/lib --libexecdir=${!outputLib}/libexec \ --bindir=${!outputBin}/bin --sbindir=${!outputBin}/sbin \ --includedir=${!outputInclude}/include \ |