From 58196b607e18c3c99268d40a0fee60462dccbdaf Mon Sep 17 00:00:00 2001 From: hsloan Date: Wed, 28 Jun 2017 16:13:11 -0400 Subject: [PATCH] libav: Don't use stdenv.cross --- pkgs/development/libraries/libav/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 785e3599bf1..3d4fbab3e42 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -13,6 +13,7 @@ , SDL # only for avplay in $bin, adds nontrivial closure to it , enableGPL ? true # ToDo: some additional default stuff may need GPL , enableUnfree ? faacSupport +, hostPlatform }: assert faacSupport -> enableUnfree; @@ -107,10 +108,10 @@ let crossAttrs = { configurePlatforms = []; configureFlags = configureFlags ++ [ - "--cross-prefix=${stdenv.cross.config}-" + "--cross-prefix=${stdenv.cc.prefix}" "--enable-cross-compile" "--target_os=linux" - "--arch=${stdenv.cross.arch}" + "--arch=${hostPlatform.arch}" ]; };