nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-19 04:03:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

virtualboxGuestAdditions: move more buildInputs to nativeBuildInputs

Browse Source
This commit is contained in:
Friedrich Altheide 2024-04-10 11:21:11 +02:00
parent 0507f64d9f
commit 4b3ae365f6
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/virtualization/virtualbox/default.nix
View File

@ -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" ];

6
pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix
View File

@ -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";

4
pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
View File

@ -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