diff options
| author | Friedrich Altheide <11352905+FriedrichAltheide@users.noreply.github.com> | 2024-04-13 08:57:32 +0200 |
|---|---|---|
| committer | Friedrich Altheide <11352905+FriedrichAltheide@users.noreply.github.com> | 2024-05-13 06:36:06 +0200 |
| commit | 296a513c842d837c0a9588628bc1c1ccf0367d4f (patch) | |
| tree | 01ddf6f484266622ada6de3a655a707c4da2ff50 /pkgs/applications/virtualization/virtualbox | |
| parent | b9ed0a34effda7460c0079cc0285eaf5d5b5eaea (diff) | |
virtualboxGuestAdditions: use nix packaged lzma
Diffstat (limited to 'pkgs/applications/virtualization/virtualbox')
| -rw-r--r-- | pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix index 84f889112befb..22522dfc99835 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/builder.nix @@ -1,6 +1,6 @@ { config, stdenv, kernel, fetchurl, lib, pam, libxslt , libX11, libXext, libXcursor, libXmu -, glib, libXrandr, dbus +, glib, libXrandr, dbus, xz , pkg-config, which, zlib, xorg , yasm, patchelf, makeself, nasm , linuxHeaders, openssl}: @@ -19,7 +19,7 @@ in stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration"; - nativeBuildInputs = [ patchelf pkg-config which yasm makeself nasm xorg.xorgserver openssl linuxHeaders ] ++ kernel.moduleBuildDependencies; + nativeBuildInputs = [ patchelf pkg-config which yasm makeself nasm xorg.xorgserver openssl linuxHeaders xz ] ++ kernel.moduleBuildDependencies; buildInputs = [ dbus libxslt libXext libXcursor pam libXmu libXrandr ]; KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; @@ -32,6 +32,7 @@ in stdenv.mkDerivation (finalAttrs: { rm -r src/libs/curl-*/ rm -r src/libs/libpng-*/ rm -r src/libs/libxml2-*/ + rm -r src/libs/liblzma-*/ rm -r src/libs/zlib*/ ''; @@ -84,6 +85,8 @@ in stdenv.mkDerivation (finalAttrs: { VBOX_NO_LEGACY_XORG_X11 := 1 SDK_VBoxLibPng_INCS := SDK_VBoxLibXml2_INCS := + SDK_VBoxLibLzma_INCS := ${xz.dev}/include + SDK_VBoxLibLzma_LIBS := ${xz.out}/lib SDK_VBoxOpenSslStatic_INCS := ${openssl.dev}/include/ssl |