From 9c163cebdd5924b223745ec59928f456cd4587fc Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 26 Jun 2017 18:47:43 -0400 Subject: [PATCH] omxplayer: Don't use stdenv.cross --- pkgs/applications/video/omxplayer/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/omxplayer/default.nix b/pkgs/applications/video/omxplayer/default.nix index 01a85f3d9528..29345f7548d5 100644 --- a/pkgs/applications/video/omxplayer/default.nix +++ b/pkgs/applications/video/omxplayer/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchurl, raspberrypifw, pcre, boost, freetype, zlib }: +{ stdenv, fetchurl +, raspberrypifw, pcre, boost, freetype, zlib +, hostPlatform +}: let ffmpeg = stdenv.mkDerivation rec { @@ -46,10 +49,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}" ]; };