diff options
| author | Friedrich Altheide <11352905+FriedrichAltheide@users.noreply.github.com> | 2024-04-10 11:21:11 +0200 |
|---|---|---|
| committer | Friedrich Altheide <11352905+FriedrichAltheide@users.noreply.github.com> | 2024-05-13 06:34:34 +0200 |
| commit | 4b3ae365f6c7595f69da6ddd74d7168dd850a98a (patch) | |
| tree | b238f63bcb21327437f3bc5abdc7db95ed6ec01b /pkgs/applications/virtualization/virtualbox | |
| parent | 0507f64d9fc84799b19c5631c5ff5ee137ac75b3 (diff) | |
virtualboxGuestAdditions: move more buildInputs to nativeBuildInputs
Diffstat (limited to 'pkgs/applications/virtualization/virtualbox')
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index a0f0a314aa03d..5ea31e2688b6e 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -66,7 +66,7 @@ in stdenv.mkDerivation { ++ optional pulseSupport libpulseaudio ++ optionals headless [ libGL ] ++ optionals (!headless) [ qtbase qtx11extras libXinerama SDL2 libGLU ] - ++ [ gsoap zlib jdk ]; + ++ optionals enableWebService [ gsoap zlib ]; hardeningDisable = [ "format" "fortify" "pic" "stackprotector" ]; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix index d054c5faad683..ec2fa5142ba6d 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix @@ -19,9 +19,9 @@ in stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration"; - nativeBuildInputs = [ patchelf makeWrapper pkg-config which yasm ]; - buildInputs = kernel.moduleBuildDependencies ++ [ libxslt libX11 libXext libXcursor - glib nasm alsa-lib makeself pam libXmu libXrandr linuxHeaders openssl libpulseaudio xorg.xorgserver ]; + nativeBuildInputs = [ patchelf makeWrapper pkg-config which yasm makeself nasm xorg.xorgserver openssl linuxHeaders ] ++ kernel.moduleBuildDependencies; + buildInputs = [ dbus libxslt libXext libXcursor + alsa-lib pam libXmu libXrandr libpulseaudio ]; KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; KERN_INCL = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/source/include"; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index ce23538ffc38e..75345d1b594c7 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -34,8 +34,8 @@ in stdenv.mkDerivation { env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration"; - nativeBuildInputs = [ patchelf makeWrapper ]; - buildInputs = [ virtualBoxNixGuestAdditionsBuilder ] ++ kernel.moduleBuildDependencies; + nativeBuildInputs = [ patchelf makeWrapper virtualBoxNixGuestAdditionsBuilder ] ++ kernel.moduleBuildDependencies; + buildInputs = [ ]; buildPhase = '' runHook preBuild |