diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2017-06-28 21:39:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-28 21:39:16 -0400 |
| commit | e1faeb574ae6f0946cdd8a3b32a5907e1d8e29da (patch) | |
| tree | 9ee09b5bb752ff52f38d0d4dc19572d4b7fc0c68 /pkgs/applications/video | |
| parent | 425e9ce493218acc5dd001cf7656e45f73b82596 (diff) | |
| parent | 9f156f4a8a945dee1beeb49f6c2acb395c0af9c8 (diff) | |
| download | nixlib-e1faeb574ae6f0946cdd8a3b32a5907e1d8e29da.tar nixlib-e1faeb574ae6f0946cdd8a3b32a5907e1d8e29da.tar.gz nixlib-e1faeb574ae6f0946cdd8a3b32a5907e1d8e29da.tar.bz2 nixlib-e1faeb574ae6f0946cdd8a3b32a5907e1d8e29da.tar.lz nixlib-e1faeb574ae6f0946cdd8a3b32a5907e1d8e29da.tar.xz nixlib-e1faeb574ae6f0946cdd8a3b32a5907e1d8e29da.tar.zst nixlib-e1faeb574ae6f0946cdd8a3b32a5907e1d8e29da.zip | |
Merge pull request #26884 from obsidiansystems/purge-stdenv-cross
Purge stdenv cross
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/omxplayer/default.nix | 9 |
1 files 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}" ]; }; |