From 944e7fb9c25f2097f4655a78f70b346b92be22ea Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Sun, 30 May 2021 15:29:16 -0700 Subject: [PATCH] rav1e: Fix cross-compiling --- pkgs/tools/video/rav1e/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/video/rav1e/default.nix b/pkgs/tools/video/rav1e/default.nix index 17c1b39a92c7..53e139cde3bb 100644 --- a/pkgs/tools/video/rav1e/default.nix +++ b/pkgs/tools/video/rav1e/default.nix @@ -1,6 +1,8 @@ -{ stdenv, rustPlatform, fetchurl, fetchFromGitHub, lib, nasm, cargo-c, libiconv }: +{ stdenv, rustPlatform, rust, fetchurl, fetchFromGitHub, lib, nasm, cargo-c, libiconv }: -rustPlatform.buildRustPackage rec { +let + rustTargetPlatformSpec = rust.toRustTargetSpec stdenv.hostPlatform; +in rustPlatform.buildRustPackage rec { pname = "rav1e"; version = "0.4.1"; @@ -31,11 +33,11 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; postBuild = '' - cargo cbuild --release --frozen --prefix=${placeholder "out"} + cargo cbuild --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} ''; postInstall = '' - cargo cinstall --release --frozen --prefix=${placeholder "out"} + cargo cinstall --release --frozen --prefix=${placeholder "out"} --target ${rustTargetPlatformSpec} ''; meta = with lib; {