diff options
| author | Cray Elliott <MP2E@archlinux.us> | 2017-11-02 09:11:49 -0700 |
|---|---|---|
| committer | Cray Elliott <MP2E@archlinux.us> | 2017-11-21 19:15:37 -0800 |
| commit | 2517cea04075fce96268431a03ec43324cb08859 (patch) | |
| tree | ee7846c7080cdfd73c9ba2a2d63fece79fc93cc2 /pkgs | |
| parent | 74d36c9acdfeb6b36f526eca8f93077aed4a2d00 (diff) | |
| download | nixpkgs-2517cea04075fce96268431a03ec43324cb08859.tar nixpkgs-2517cea04075fce96268431a03ec43324cb08859.tar.gz nixpkgs-2517cea04075fce96268431a03ec43324cb08859.tar.bz2 nixpkgs-2517cea04075fce96268431a03ec43324cb08859.tar.lz nixpkgs-2517cea04075fce96268431a03ec43324cb08859.tar.xz nixpkgs-2517cea04075fce96268431a03ec43324cb08859.tar.zst nixpkgs-2517cea04075fce96268431a03ec43324cb08859.zip | |
nvidia-x11-stable: 384.90 -> 387.22
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/settings.nix | 3 |
2 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index ba9b332e6d7..154fcbb6b84 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -6,11 +6,11 @@ in { # Policy: use the highest stable version as the default (on our master). stable = generic { - version = "384.90"; - sha256_32bit = "0mq0h7g56m9zvr42ipy2664ph922754l0pdp8wpsmzfpkzg6g9lp"; - sha256_64bit = "1ggylpzw1j217w64rspw4fhvq25wz0la0hhy0b1kxjpwy8h6ipqd"; - settingsSha256 = "023jfbsxsbkjk78i9i6wd0sybv5hib2d7mfvy635w3anjcrsk5il"; - persistencedSha256 = "166ya8pnv4frvrsp0x5zkg8li85vipags03wy6dlf8s940al92z2"; + version = "387.22"; + sha256_32bit = "16v4ljq07hs1xw6amc7cmddvmmmd3swli3b617xs8f3qcw54ym1r"; + sha256_64bit = "1i0fmzsv4bkfxaw2wnnhj2z64gdyqd6xvxrsq7zj7gq7crcd6sma"; + settingsSha256 = "0wszyfj9hcib7dcfin22nsrfsm1mb4rq6ha5fma7sq68p175j1yk"; + persistencedSha256 = "0wrkmw8gw780vcl0s0d0vd8niaf741ji5sggxxqb1aa1w61rjf0d"; }; beta = generic { diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix index e272ac14de0..acdc44c702f 100644 --- a/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -44,7 +44,8 @@ stdenv.mkDerivation rec { buildInputs = [ jansson libXv libXrandr libvdpau nvidia_x11 gtk2 dbus ] ++ lib.optionals withGtk3 [ gtk3 librsvg wrapGAppsHook ]; - NIX_LDFLAGS = [ "-lvdpau" "-lXrandr" "-lXv" "-lnvidia-ml" ]; +# This next line makes the nvidia-settings binary fail to compile as of version 387.22 +# NIX_LDFLAGS = [ "-lvdpau" "-lXrandr" "-lXv" "-lnvidia-ml" ]; makeFlags = [ "NV_USE_BUNDLED_LIBJANSSON=0" ]; installFlags = [ "PREFIX=$(out)" ]; |