diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-05-09 13:43:23 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-11-09 10:02:24 +0100 |
| commit | 506dcaabb4e004ed5db214f7efbbc278e89f6212 (patch) | |
| tree | 598008dc703c9bb99df9bfe8311a926e1a900603 /pkgs/development/libraries | |
| parent | e3e57b8f1885bf1dc4787728479711f46a4171cc (diff) | |
| download | nixpkgs-506dcaabb4e004ed5db214f7efbbc278e89f6212.tar nixpkgs-506dcaabb4e004ed5db214f7efbbc278e89f6212.tar.gz nixpkgs-506dcaabb4e004ed5db214f7efbbc278e89f6212.tar.bz2 nixpkgs-506dcaabb4e004ed5db214f7efbbc278e89f6212.tar.lz nixpkgs-506dcaabb4e004ed5db214f7efbbc278e89f6212.tar.xz nixpkgs-506dcaabb4e004ed5db214f7efbbc278e89f6212.tar.zst nixpkgs-506dcaabb4e004ed5db214f7efbbc278e89f6212.zip | |
stdenv: fix meson rust cross compilation
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/gstreamer/rs/default.nix | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/pkgs/development/libraries/gstreamer/rs/default.nix b/pkgs/development/libraries/gstreamer/rs/default.nix index 1d06f880959..ee467f965c8 100644 --- a/pkgs/development/libraries/gstreamer/rs/default.nix +++ b/pkgs/development/libraries/gstreamer/rs/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchFromGitLab , fetchpatch -, writeText , rustPlatform , meson , ninja @@ -204,14 +203,7 @@ stdenv.mkDerivation rec { ) ++ [ (lib.mesonOption "sodium-source" "system") (lib.mesonEnable "doc" enableDocumentation) - ] ++ (let - crossFile = writeText "cross-file.conf" '' - [binaries] - rust = [ 'rustc', '--target', '${stdenv.hostPlatform.rust.rustcTargetSpec}' ] - ''; - in lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - "--cross-file=${crossFile}" - ]); + ]; # turn off all auto plugins since we use a list of plugins we generate mesonAutoFeatures = "disabled"; |