Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pkgsLLVM.x264: fix build #210983

Closed
wants to merge 1 commit into from
Closed

pkgsLLVM.x264: fix build #210983

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions pkgs/development/libraries/x264/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ stdenv.mkDerivation rec {

outputs = [ "out" "lib" "dev" ];

STRINGS = if stdenv.hostPlatform.useLLVM or false
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm, smells like we would need a stdenv.bintools.isLLVM or false of some kind…

Copy link
Member

@winterqt winterqt Jan 15, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess LLVM bintools and GCC could be mixed, but would anyone actually do that? You're probably right, though, it's something that should be done for posterity if nothing else.

then "${stdenv.cc.targetPrefix}llvm-strings"
else null;

preConfigure = lib.optionalString (stdenv.buildPlatform.isx86_64 || stdenv.hostPlatform.isi686) ''
# `AS' is set to the binutils assembler, but we need nasm
unset AS
Expand Down