diff options
| author | Adam Joseph <adam@westernsemico.com> | 2023-11-13 06:47:08 -0800 |
|---|---|---|
| committer | Adam Joseph <54836058+amjoseph-nixpkgs@users.noreply.github.com> | 2023-11-17 08:07:34 +0000 |
| commit | c7e0f6b9050553dfa8dff259a0536326ac43b0ff (patch) | |
| tree | 6862049af64b6ccf9911f5cb54f1651aaf07a182 /pkgs/development/libraries/ffmpeg/generic.nix | |
| parent | 6a689e72efffde73cc2c6cfa7e142a8d7f8feafd (diff) | |
| download | nixlib-c7e0f6b9050553dfa8dff259a0536326ac43b0ff.tar nixlib-c7e0f6b9050553dfa8dff259a0536326ac43b0ff.tar.gz nixlib-c7e0f6b9050553dfa8dff259a0536326ac43b0ff.tar.bz2 nixlib-c7e0f6b9050553dfa8dff259a0536326ac43b0ff.tar.lz nixlib-c7e0f6b9050553dfa8dff259a0536326ac43b0ff.tar.xz nixlib-c7e0f6b9050553dfa8dff259a0536326ac43b0ff.tar.zst nixlib-c7e0f6b9050553dfa8dff259a0536326ac43b0ff.zip | |
treewide: s_targetPlatform_hostPlatform_ in non-compiler packages
stdenv.targetPlatform really shouldn't be used by software that doesn't generate or manipulate binaries. I reviewed all uses of targetPlatform outside of pkgs/development/compilers and pkgs/stdenv and replaced those which weren't involved in something which fits these criteria.
Diffstat (limited to 'pkgs/development/libraries/ffmpeg/generic.nix')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/generic.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 57235b24308d..e713ca1413fb 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -52,7 +52,7 @@ , withLadspa ? withFullDeps # LADSPA audio filtering , withLibplacebo ? withFullDeps && !stdenv.isDarwin # libplacebo video processing library , withLzma ? withHeadlessDeps # xz-utils -, withMfx ? withFullDeps && (with stdenv.targetPlatform; isLinux && !isAarch) # Hardware acceleration via intel-media-sdk/libmfx +, withMfx ? withFullDeps && (with stdenv.hostPlatform; isLinux && !isAarch) # Hardware acceleration via intel-media-sdk/libmfx , withModplug ? withFullDeps && !stdenv.isDarwin # ModPlug support , withMp3lame ? withHeadlessDeps # LAME MP3 encoder , withMysofa ? withFullDeps # HRTF support via SOFAlizer @@ -386,8 +386,8 @@ stdenv.mkDerivation (finalAttrs: { (enableFeature withHardcodedTables "hardcoded-tables") (enableFeature withSafeBitstreamReader "safe-bitstream-reader") - (enableFeature (withMultithread && stdenv.targetPlatform.isUnix) "pthreads") - (enableFeature (withMultithread && stdenv.targetPlatform.isWindows) "w32threads") + (enableFeature (withMultithread && stdenv.hostPlatform.isUnix) "pthreads") + (enableFeature (withMultithread && stdenv.hostPlatform.isWindows) "w32threads") "--disable-os2threads" # We don't support OS/2 (enableFeature withNetwork "network") |