diff options
author | Jaka Hudoklin <jakahudoklin@gmail.com> | 2014-01-22 10:57:43 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-01-23 12:11:28 +0100 |
commit | e0000f8ad1cf4b2f85d56033751c6eb61bc7c073 (patch) | |
tree | 925740e2a364b8f34d838118c772b95b4d66dfab /pkgs/os-specific/linux/ati-drivers/default.nix | |
parent | f5461b02d5e998fc03bd11d84a0d5be733672959 (diff) | |
download | nixlib-e0000f8ad1cf4b2f85d56033751c6eb61bc7c073.tar nixlib-e0000f8ad1cf4b2f85d56033751c6eb61bc7c073.tar.gz nixlib-e0000f8ad1cf4b2f85d56033751c6eb61bc7c073.tar.bz2 nixlib-e0000f8ad1cf4b2f85d56033751c6eb61bc7c073.tar.lz nixlib-e0000f8ad1cf4b2f85d56033751c6eb61bc7c073.tar.xz nixlib-e0000f8ad1cf4b2f85d56033751c6eb61bc7c073.tar.zst nixlib-e0000f8ad1cf4b2f85d56033751c6eb61bc7c073.zip |
ati-drivers: update to 13.12 (close #1569)
This update is mostly effort from @MarcWeber and @vcunat, now tested on real hardware making sure it works with multiple GPUs and opencl.
Diffstat (limited to 'pkgs/os-specific/linux/ati-drivers/default.nix')
-rw-r--r-- | pkgs/os-specific/linux/ati-drivers/default.nix | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index 8f5ecb712059..518ca784d4a8 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -13,30 +13,35 @@ # See http://thread.gmane.org/gmane.linux.distributions.nixos/4145 for a # workaround (TODO) -# The gentoo ebuild contains much more magic.. +# The gentoo ebuild contains much more magic and is usually a great resource to +# find patches :) # http://wiki.cchtml.com/index.php/Main_Page # There is one issue left: # /usr/lib/dri/fglrx_dri.so must point to /run/opengl-driver/lib/fglrx_dri.so -assert stdenv.system == "x86_64-linux"; +# You eventually have to blacklist radeon module (?) +assert stdenv.system == "x86_64-linux"; stdenv.mkDerivation { - name = "ati-drivers-13.4-${kernel.version}"; + name = "ati-drivers-13.12-${kernel.version}"; builder = ./builder.sh; inherit libXxf86vm xf86vidmodeproto; + gcc = stdenv.gcc.gcc; src = fetchurl { - url = http://www2.ati.com/drivers/linux/amd-driver-installer-catalyst-13-4-linux-x86.x86_64.zip; - sha256 = "1914ikdich0kg047bqh89ai5z4dyryj5mlw5i46n90fsfiaxa532"; + url = http://www2.ati.com/drivers/linux/amd-catalyst-13.12-linux-x86.x86_64.zip; + sha256 = "1jm0c4rqyjjhyj8a7axf4hz16bcvy8yhnkn45wc2l73xhks36h02"; curlOpts = "--referer http://support.amd.com/en-us/download/desktop?os=Linux%20x86_64"; }; - patchPhase = "patch -p0 < ${./gentoo-patches.patch}"; + # most patches are taken from gentoo + patchPhase = "patch -p1 < ${./gentoo-patches.patch}"; + patchPhaseSamples = "patch -p2 < ${./patch-samples.patch}"; buildInputs = [ xlibs.libXext xlibs.libX11 xlibs.libXinerama @@ -61,18 +66,17 @@ stdenv.mkDerivation { # without this some applications like blender don't start, but they start # with nvidia. This causes them to be symlinked to $out/lib so that they # appear in /run/opengl-driver/lib which get's added to LD_LIBRARY_PATH - extraDRIlibs = [ xorg.libXext ]; + extraDRIlibs = [ xorg.libXext ]; inherit mesa; # only required to build examples - meta = { + meta = with stdenv.lib; { description = "ATI drivers"; homepage = http://support.amd.com/us/gpudownload/Pages/index.aspx; - license = "unfree"; - maintainers = [stdenv.lib.maintainers.marcweber]; + license = licenses.unfree; + maintainers = with maintainers; [marcweber offline]; platforms = [ "x86_64-linux" ]; hydraPlatforms = []; - broken = true; }; # moved assertions here because the name is evaluated when the NixOS manual is generated |