Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0158bc0f0ea6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b7b8e1f2e73d
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 7, 2019

  1. linuxPackages.virtualBoxGuestAdditions: fix build 

    Fixes #70470
    @lheckemann
    lheckemann committed Oct 7, 2019
    Copy the full SHA
    22011b0 View commit details

  2. Merge #70618: linuxPackages.virtualBoxGuestAdditions: fix build

    @vcunat
    vcunat committed Oct 7, 2019
    Copy the full SHA
    b7b8e1f View commit details
Showing with 2 additions and 0 deletions.
  1. +2 −0 pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
2 changes: 2 additions & 0 deletions pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
View file
Original file line number Diff line number Diff line change
@@ -55,6 +55,8 @@ in stdenv.mkDerivation {
${if stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux" then ''
isoinfo -J -i $src -x /VBoxLinuxAdditions.run > ./VBoxLinuxAdditions.run
chmod 755 ./VBoxLinuxAdditions.run
# An overflow leads the is-there-enough-space check to fail when there's too much space available, so fake how much space there is
sed -i 's/\$leftspace/16383/' VBoxLinuxAdditions.run
./VBoxLinuxAdditions.run --noexec --keep
''
else throw ("Architecture: "+stdenv.hostPlatform.system+" not supported for VirtualBox guest additions")