diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 01:55:26 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 01:55:26 -0400 |
| commit | 006422d08d7f0576d745baa23328e951e0f7b4c2 (patch) | |
| tree | cc8c8d5c08feaa648003a01d2c5f692ee5b188c6 /pkgs/development/libraries/ffmpeg | |
| parent | df062e3f7be4724973e4bcfa65e304b6a7ef746a (diff) | |
| parent | feb648ce59ffbed94c58133eb7aa2761992a35e1 (diff) | |
| download | nixlib-006422d08d7f0576d745baa23328e951e0f7b4c2.tar nixlib-006422d08d7f0576d745baa23328e951e0f7b4c2.tar.gz nixlib-006422d08d7f0576d745baa23328e951e0f7b4c2.tar.bz2 nixlib-006422d08d7f0576d745baa23328e951e0f7b4c2.tar.lz nixlib-006422d08d7f0576d745baa23328e951e0f7b4c2.tar.xz nixlib-006422d08d7f0576d745baa23328e951e0f7b4c2.tar.zst nixlib-006422d08d7f0576d745baa23328e951e0f7b4c2.zip | |
Merge commit 'feb648ce59ffbed94c58133eb7aa2761992a35e1' into staging
Diffstat (limited to 'pkgs/development/libraries/ffmpeg')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/generic.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 7226645381b6..0883e5dfd500 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -177,7 +177,7 @@ stdenv.mkDerivation rec { "--cross-prefix=${stdenv.cc.targetPrefix}" "--enable-cross-compile" "--target_os=${hostPlatform.parsed.kernel.name}" - "--arch=${hostPlatform.arch}" + "--arch=${hostPlatform.parsed.cpu.name}" ]; }; |