diff options
| author | Pol Dellaiera <pol.dellaiera@protonmail.com> | 2024-05-11 10:16:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-11 10:16:25 +0200 |
| commit | 8a7f93574bfa90e8efa16514d2168729c79a1d61 (patch) | |
| tree | f35e6e93d08d171047adc73a1952f55e1eae1670 /pkgs/applications/virtualization/virtualbox | |
| parent | c22cb3fb9c6c86f9b3eff94d375a90d7c3ef2e72 (diff) | |
| parent | 331d80d9e534d94478f709b8758b2c1248d70469 (diff) | |
Merge pull request #306592 from Yarny0/virtualbox-iso-fix
virtualbox: fix symlink to guest additions iso
Diffstat (limited to 'pkgs/applications/virtualization/virtualbox')
| -rw-r--r-- | pkgs/applications/virtualization/virtualbox/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix | 19 |
2 files changed, 5 insertions, 16 deletions
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 3b0783a1509b5..b09736d3138c6 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -251,7 +251,7 @@ in stdenv.mkDerivation { mkdir -p "$out/share/virtualbox" cp -rv src/VBox/Main/UnattendedTemplates "$out/share/virtualbox" - ln -s "${virtualboxGuestAdditionsIso}/VBoxGuestAdditions_${version}.iso" "$out/share/virtualbox/VBoxGuestAdditions.iso" + ln -s "${virtualboxGuestAdditionsIso}" "$out/share/virtualbox/VBoxGuestAdditions.iso" ''; preFixup = optionalString (!headless) '' diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix index d2f9bc62ba18b..cd2f58afc92a6 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix @@ -1,22 +1,11 @@ -{ stdenv, fetchurl, lib, virtualbox}: +{ fetchurl, lib, virtualbox}: let inherit (virtualbox) version; in -stdenv.mkDerivation rec { - pname = "VirtualBox-GuestAdditions-iso"; - inherit version; - - src = fetchurl { - url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "0efbcb9bf4722cb19292ae00eba29587432e918d3b1f70905deb70f7cf78e8ce"; - }; - - buildCommand = '' - mkdir -p $out - cp $src $out/ - ''; - +fetchurl { + url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; + sha256 = "0efbcb9bf4722cb19292ae00eba29587432e918d3b1f70905deb70f7cf78e8ce"; meta = { description = "Guest additions ISO for VirtualBox"; longDescription = '' |