mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
vlc: __structuredAttrs, split outputs, and a bit more (#536460)
This commit is contained in:
commit
55bee1aa4a
1 changed files with 10 additions and 4 deletions
|
|
@ -219,15 +219,21 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
]
|
||||
)
|
||||
++ optionals (waylandSupport && withQt5) [ libsForQt5.qtwayland ];
|
||||
|
||||
strictDeps = true;
|
||||
__structuredAttrs = true;
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
"doc"
|
||||
"man"
|
||||
];
|
||||
|
||||
env = {
|
||||
# vlc searches for c11-gcc, c11, c99-gcc, c99, which don't exist and would be wrong for cross compilation anyway.
|
||||
BUILDCC = "${pkgsBuildBuild.stdenv.cc}/bin/gcc";
|
||||
BUILDCC = lib.getExe pkgsBuildBuild.stdenv.cc;
|
||||
LIVE555_PREFIX = live555;
|
||||
}
|
||||
// lib.optionalAttrs stdenv.cc.isGNU {
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue