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: f491e94bacd0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 72216e12de05
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 1, 2019

  1. virtualboxHeadless: Fix build

    @knedlsepp
    knedlsepp committed Jun 1, 2019
    Copy the full SHA
    25a89d0 View commit details

Commits on Jun 9, 2019

  1. Merge #62393: virtualboxHeadless: Fix build

    @vcunat
    vcunat committed Jun 9, 2019
    Copy the full SHA
    72216e1 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/applications/virtualization/virtualbox/default.nix
4 changes: 2 additions & 2 deletions pkgs/applications/virtualization/virtualbox/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ config, stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2
, libX11, xorgproto, libXext, libXcursor, libXmu, qt5, libIDL, SDL, libcap
, libX11, xorgproto, libXext, libXcursor, libXmu, qt5, libIDL, SDL, libcap, libGL
, libpng, glib, lvm2, libXrandr, libXinerama, libopus
, pkgconfig, which, docbook_xsl, docbook_xml_dtd_43
, alsaLib, curl, libvpx, nettools, dbus
@@ -42,7 +42,7 @@ in stdenv.mkDerivation {
++ optional javaBindings jdk
++ optional pythonBindings python # Python is needed even when not building bindings
++ optional pulseSupport libpulseaudio
++ optionals (headless) [ libXrandr ]
++ optionals (headless) [ libXrandr libGL ]
++ optionals (!headless) [ qt5.qtbase qt5.qtx11extras libXinerama SDL ];

hardeningDisable = [ "format" "fortify" "pic" "stackprotector" ];