diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2021-01-17 18:09:56 +0100 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2021-01-17 18:09:56 +0100 |
| commit | 57d863b1f03c81f2be744a6e34c37edf6219edf4 (patch) | |
| tree | 3dc62c99b8019d1e88f6c1e9c9635f63786b242b /pkgs/tools/X11/bumblebee/default.nix | |
| parent | 5ca647b244f39cd09ae60840082b37721970d22f (diff) | |
| parent | 1279bf812ca11fa50a501aad5116c51afd7390a6 (diff) | |
| download | nixpkgs-57d863b1f03c81f2be744a6e34c37edf6219edf4.tar nixpkgs-57d863b1f03c81f2be744a6e34c37edf6219edf4.tar.gz nixpkgs-57d863b1f03c81f2be744a6e34c37edf6219edf4.tar.bz2 nixpkgs-57d863b1f03c81f2be744a6e34c37edf6219edf4.tar.lz nixpkgs-57d863b1f03c81f2be744a6e34c37edf6219edf4.tar.xz nixpkgs-57d863b1f03c81f2be744a6e34c37edf6219edf4.tar.zst nixpkgs-57d863b1f03c81f2be744a6e34c37edf6219edf4.zip | |
Merge remote-tracking branch 'upstream/staging-next' into HEAD
Diffstat (limited to 'pkgs/tools/X11/bumblebee/default.nix')
| -rw-r--r-- | pkgs/tools/X11/bumblebee/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index 8bd65ec2fc2..706194cc0dd 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -16,7 +16,7 @@ # # To use at startup, see hardware.bumblebee options. -{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, help2man, makeWrapper +{ stdenv, lib, fetchurl, fetchpatch, pkg-config, help2man, makeWrapper , glib, libbsd , libX11, xorgserver, kmod, xf86videonouveau , nvidia_x11, virtualgl, libglvnd @@ -103,7 +103,7 @@ in stdenv.mkDerivation rec { # Build-time dependencies of bumblebeed and optirun. # Note that it has several runtime dependencies. buildInputs = [ libX11 glib libbsd kmod ]; - nativeBuildInputs = [ makeWrapper pkgconfig help2man automake111x autoconf ]; + nativeBuildInputs = [ makeWrapper pkg-config help2man automake111x autoconf ]; # The order of LDPATH is very specific: First X11 then the host # environment then the optional sub architecture paths. |