various: fixes for strictDeps = true (#355844)
This commit is contained in:
@@ -27,7 +27,8 @@ rec {
|
||||
};
|
||||
|
||||
extract = args@{ name ? "${args.pname}-${args.version}", postExtract ? "", src, ... }: pkgs.runCommand "${name}-extracted" {
|
||||
buildInputs = [ appimage-exec ];
|
||||
nativeBuildInputs = [ appimage-exec ];
|
||||
strictDeps = true;
|
||||
} ''
|
||||
appimage-exec.sh -x $out ${src}
|
||||
${postExtract}
|
||||
|
||||
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
mysql80
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -25,6 +26,8 @@ stdenv.mkDerivation rec {
|
||||
mysql80
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
cmakeFlags = [
|
||||
# libmysqlclient is shared library
|
||||
"-DMYSQLCLIENT_STATIC_LINKING=false"
|
||||
|
||||
@@ -61,6 +61,7 @@ stdenv.mkDerivation rec {
|
||||
systemd
|
||||
util-linuxMinimal # for libmount
|
||||
];
|
||||
strictDeps = true;
|
||||
|
||||
makeFlags = [
|
||||
"LIB=lib"
|
||||
@@ -77,7 +78,7 @@ stdenv.mkDerivation rec {
|
||||
# skip test attempting to access /sys/dev/block
|
||||
substituteInPlace tests/Makefile --replace-fail ' devt ' ' '
|
||||
'';
|
||||
nativeCheckInputs = [ cmocka ];
|
||||
checkInputs = [ cmocka ];
|
||||
|
||||
passthru.tests = { inherit (nixosTests) iscsi-multipath-root; };
|
||||
|
||||
|
||||
@@ -34,14 +34,16 @@ stdenv.mkDerivation rec {
|
||||
pkg-config
|
||||
python3
|
||||
python3.pkgs.setuptools
|
||||
] ++ lib.optionals (!static) [
|
||||
python3.pkgs.twisted
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
] ++ lib.optionals (!static) [
|
||||
(python3.withPackages (ps: [ps.twisted]))
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
libevent
|
||||
openssl
|
||||
|
||||
@@ -189,6 +189,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
systemd
|
||||
taglib
|
||||
xcbutilkeysyms
|
||||
wayland-scanner # only required for configure script
|
||||
zlib
|
||||
]
|
||||
++ optionals (!stdenv.hostPlatform.isAarch && !onlyLibVLC) [ live555 ]
|
||||
@@ -207,6 +208,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
qtx11extras
|
||||
])
|
||||
++ optionals (waylandSupport && withQt5) [ libsForQt5.qtwayland ];
|
||||
strictDeps = true;
|
||||
|
||||
env = {
|
||||
# vlc depends on a c11-gcc wrapper script which we don't have so we need to
|
||||
|
||||
@@ -55,9 +55,9 @@ let
|
||||
name = "flutter-${version}-unwrapped";
|
||||
inherit src patches version;
|
||||
|
||||
buildInputs = [ git ];
|
||||
nativeBuildInputs = [ makeWrapper jq ]
|
||||
nativeBuildInputs = [ makeWrapper jq git ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ];
|
||||
strictDeps = true;
|
||||
|
||||
preConfigure = ''
|
||||
if [ "$(< bin/internal/engine.version)" != '${engineVersion}' ]; then
|
||||
|
||||
@@ -90,6 +90,7 @@ stdenv.mkDerivation (finalAttrs: ({
|
||||
++ lib.optional (postgresql != null) postgresql;
|
||||
|
||||
nativeBuildInputs = [ bison flex gperf lndir perl pkg-config which ]
|
||||
++ lib.optionals (mysqlSupport) [ libmysqlclient ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ];
|
||||
|
||||
} // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) {
|
||||
@@ -101,6 +102,8 @@ stdenv.mkDerivation (finalAttrs: ({
|
||||
|
||||
propagatedNativeBuildInputs = [ lndir ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
# libQt5Core links calls CoreFoundation APIs that call into the system ICU. Binaries linked
|
||||
# against it will crash during build unless they can access `/usr/share/icu/icudtXXl.dat`.
|
||||
propagatedSandboxProfile = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
|
||||
@@ -24,8 +24,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
depsBuildBuild = [ pkg-config ];
|
||||
nativeBuildInputs = [ meson ninja wayland-scanner ];
|
||||
nativeCheckInputs = [ python3 ];
|
||||
nativeCheckInputs = [ python3 wayland ];
|
||||
checkInputs = [ wayland ];
|
||||
strictDeps = true;
|
||||
|
||||
mesonFlags = [ "-Dtests=${lib.boolToString finalAttrs.doCheck}" ];
|
||||
|
||||
|
||||
@@ -90,7 +90,7 @@ lib.fix (
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
meson test -C _meson-build --no-rebuild --print-errorlogs
|
||||
meson test -C _meson-build --no-rebuild --print-errorlogs --timeout-multiplier 0
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
@@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-At/ZQ/lnQvf5zXiFWzJwjqTfVIycFK+Sc4F/O72dIrI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ bison cmake pkg-config ]
|
||||
nativeBuildInputs = [ bison cmake pkg-config protobuf ]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ];
|
||||
|
||||
patches = [
|
||||
@@ -34,6 +34,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cctools CoreServices developer_cmds DarwinTools
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
outputs = [ "out" "static" ];
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@@ -23,8 +23,9 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ gettext fuse openssl tinyxml2 ];
|
||||
nativeBuildInputs = [ cmake pkg-config perl ];
|
||||
buildInputs = [ fuse openssl tinyxml2 ];
|
||||
nativeBuildInputs = [ cmake pkg-config perl gettext ];
|
||||
strictDeps = true;
|
||||
|
||||
cmakeFlags =
|
||||
[ "-DUSE_INTERNAL_TINYXML=OFF"
|
||||
|
||||
Reference in New Issue
Block a user