diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-09-17 01:24:34 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-09-17 01:29:27 +0200 |
| commit | 12a45a8496b950f7bb289cbdf7245f452a8908a7 (patch) | |
| tree | 7c15b12ee56dae64deff635a97d9bacf058c4686 /pkgs/os-specific/linux/ati-drivers/default.nix | |
| parent | 5ade8fff793908dbfed7c4b4f5ae904ae6326bfc (diff) | |
| parent | 7bc91ffe41d6c4adaa2a778dcf1526caa0f8677b (diff) | |
| download | nixlib-12a45a8496b950f7bb289cbdf7245f452a8908a7.tar nixlib-12a45a8496b950f7bb289cbdf7245f452a8908a7.tar.gz nixlib-12a45a8496b950f7bb289cbdf7245f452a8908a7.tar.bz2 nixlib-12a45a8496b950f7bb289cbdf7245f452a8908a7.tar.lz nixlib-12a45a8496b950f7bb289cbdf7245f452a8908a7.tar.xz nixlib-12a45a8496b950f7bb289cbdf7245f452a8908a7.tar.zst nixlib-12a45a8496b950f7bb289cbdf7245f452a8908a7.zip | |
Merge #18237: ati_drivers_x11: patch for kernel 4.6
Diffstat (limited to 'pkgs/os-specific/linux/ati-drivers/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/ati-drivers/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index 902f0e37e35f..3bfd59de7ed6 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -73,8 +73,11 @@ stdenv.mkDerivation rec { ./patches/15.9-kcl_str.patch ./patches/15.9-mtrr.patch ./patches/15.9-preempt.patch - ./patches/15.9-sep_printf.patch - ]; + ./patches/15.9-sep_printf.patch ] + ++ optionals ( kernel != null && + (builtins.compareVersions kernel.version "4.6") >= 0 ) + [ ./patches/kernel-4.6-get_user_pages.patch + ./patches/kernel-4.6-page_cache_release-put_page.patch ]; buildInputs = [ xorg.libXrender xorg.libXext xorg.libX11 xorg.libXinerama xorg.libSM |