adding ati-drivers There is still much to be done, see http://thread.gmane.org/gmane.linux.distributions.nixos/4145

svn path=/nixpkgs/trunk/; revision=21848

pkgs/os-specific/linux/ati-drivers/builder.sh

@@ -0,0 +1,175 @@
+# What is LIBGL_DRIVERS_PATH used for?
+# TODO gentoo removes some tools because there are xorg sources (?)
+
+source $stdenv/setup
+
+die(){ echo $@; exit 1; }
+
+
+# custom unpack:
+cp $src archive
+sh archive --extract .
+
+
+kernelVersion=$(cd ${kernel}/lib/modules && ls)
+kernelBuild=$(echo ${kernel}/lib/modules/$kernelVersion/build)
+
+
+# note: maybe the .config file should be used to determine this ?
+# current kbuild infrastructure allows using CONFIG_* defines
+# but ati sources don't use them yet..
+# copy paste from make.sh
+setSMP(){
+
+  linuxincludes=$kernelBuild/include
+
+  # copied and stripped. source: make.sh:
+
+  # 3
+  # linux/autoconf.h may contain this: #define CONFIG_SMP 1
+
+  src_file=$linuxincludes/linux/autoconf.h
+  [ -e $src_file ] || die "$src_file not found"
+
+  if [ `cat $src_file | grep "#undef" | grep "CONFIG_SMP" -c` = 0 ]; then
+    SMP=`cat $src_file | grep CONFIG_SMP | cut -d' ' -f3`
+    echo "file $src_file says: SMP=$SMP"
+  fi
+
+  if [ "$SMP" = 0 ]; then
+    echo "assuming default: SMP=$SMP"
+  fi
+
+  # act on final result
+  if [ ! "$SMP" = 0 ]; then
+    smp="-SMP"
+    def_smp=-D__SMP__
+  fi
+
+}
+
+setModVersions(){
+  ! grep CONFIG_MODVERSIONS=y $kernel/config ||
+  def_modversions="-DMODVERSIONS"
+  # make.sh contains much more code to determine this whether its enabled
+}
+
+
+# make.sh contains some code figuring out whether to use these or not..
+PAGE_ATTR_FIX=0
+setSMP
+setModVersions
+CC=gcc
+MODULE=fglrx
+case "$system" in
+  x86_64-linux)
+    arch=x86_64
+    lib_arch=lib64
+  ;;
+  i686-linux)
+    arch=x86
+    lib_arch=lib
+  ;;
+  *) exit 1;;
+esac
+LIBIP_PREFIX=$TMP/arch/$arch/lib/modules/fglrx/build_mod
+[ -d $LIBIP_PREFIX ]
+GCC_MAJOR="`gcc --version | grep -o -e ") ." | head -1 | cut -d " " -f 2`"
+
+{ # build .ko module
+  cd ./common/lib/modules/fglrx/build_mod/2.6.x
+  echo .lib${MODULE}_ip.a.GCC${GCC_MAJOR}.cmd
+  echo 'This is a dummy file created to suppress this warning: could not find /lib/modules/fglrx/build_mod/2.6.x/.libfglrx_ip.a.GCC4.cmd for /lib/modules/fglrx/build_mod/2.6.x/libfglrx_ip.a.GCC4' > lib${MODULE}_ip.a.GCC${GCC_MAJOR}.cmd
+
+  make CC=${CC} \
+      LIBIP_PREFIX=$(echo "$LIBIP_PREFIX" | sed -e 's|^\([^/]\)|../\1|') \
+      MODFLAGS="-DMODULE -DATI -DFGL -DPAGE_ATTR_FIX=$PAGE_ATTR_FIX $def_smp $def_modversions" \
+      KVER=$kernelVersion \
+      KDIR=$kernelBuild \
+      PAGE_ATTR_FIX=$PAGE_ATTR_FIX \
+      -j4
+
+  cd $TMP
+}
+
+{ # install
+
+  ensureDir $out/lib/xorg
+
+  cp -r common/usr/include $out
+  cp -r common/usr/sbin $out
+  cp -r common/usr/share $out
+  cp -r common/usr/X11R6 $out
+
+  cp -r arch/$arch/lib $out/lib
+
+  # what are those files used for?
+  cp -r common/etc $out
+
+  DIR_DEPENDING_ON_XORG_VERSION=x750_64a
+  cp -r $DIR_DEPENDING_ON_XORG_VERSION/usr/X11R6/$lib_arch/* $out/lib/xorg
+
+  t=$out/lib/modules/${kernelVersion}/kernel/drivers/misc
+  ensureDir $t
+
+  cp ./common/lib/modules/fglrx/build_mod/2.6.x/fglrx.ko $t
+
+  # should this be installed at all?
+  # its used by the example fglrx_gamma only
+  # don't use $out/lib/modules/dri because this will cause the kernel module
+  # aggregator code to see both: kernel version and the dri direcotry. It'll
+  # fail saying different kernel versions
+  cp -r $TMP/arch/$arch/usr/X11R6/$lib_arch/modules/dri $out/lib
+  cp -r $TMP/arch/$arch/usr/X11R6/$lib_arch/modules/dri/* $out/lib
+  cp -r $TMP/arch/$arch/usr/X11R6/$lib_arch/*.so.* $out/lib
+  cp -r $TMP/arch/$arch/usr/$lib_arch/* $out/lib
+
+  # cp -r $TMP/arch/$arch/usr/$lib_arch/* $out/lib
+  ln -s libatiuki.so.1.0 $out/lib/libatiuki.so.1
+  ln -s libGL.so.1.2 $out/lib/libGL.so.1
+  ln -s libfglrx_gamma.so.1.0 $out/lib/libfglrx_gamma.so.1
+
+}
+
+{ # build samples
+  ensureDir $out/bin
+
+  mkdir -p samples
+  cd samples
+  tar xfz ../common/usr/src/ati/fglrx_sample_source.tgz
+
+
+  ( # build and install fgl_glxgears
+    cd fgl_glxgears; 
+    gcc -DGL_ARB_texture_multisample=1 -g \
+    -I$mesa/include \
+    -I$out/include \
+    -L$mesa/lib -lGL -lGLU -lX11 -lm \
+    -o $out/bin/fgl_glxgears -Wall  fgl_glxgears.c
+  )
+
+  true || ( # build and install
+
+    # doesn't build  undefined reference to `FGLRX_X11SetGamma'
+    # wich should be contained in -lfglrx_gamma
+
+    cd programs/fglrx_gamma
+    gcc -fPIC -I${libXxf86vm}/include \
+	    -I${xf86vidmodeproto}/include \
+	    -I$out/X11R6/include \
+	    -L$out/lib \
+	    -Wall -lm -lfglrx_gamma -lX11 -lXext -o fglrx_xgamma fglrx_xgamma.c 
+  )
+
+  { # copy binaries and wrap them:
+    BIN=$TMP/arch/$arch/usr/X11R6/bin
+    cp $BIN/* $out/bin
+    for prog in $BIN/*; do
+      patchelf --set-interpreter $(echo $glibc/lib/ld-linux*.so.2) $out/bin/$(basename $prog)
+      wrapProgram $out/bin/$(basename $prog) --prefix LD_LIBRARY_PATH : $out/lib:$LD_LIBRARY_PATH
+    done
+  }
+
+  rm -fr $out/lib/modules/fglrx # don't think those .a files are needed. They cause failure of the mod
+
+}

pkgs/os-specific/linux/ati-drivers/default.nix

@@ -0,0 +1,61 @@
+{stdenv, fetchurl , kernel, xlibs, which, imake
+, mesa # for fgl_glxgears
+, libXxf86vm, xf86vidmodeproto # for fglrx_gamma
+, xorg, makeWrapper, glibc, patchelf
+}:
+
+# If you want to use a different Xorg version probably
+# DIR_DEPENDING_ON_XORG_VERSION in builder.sh has to be adopted (?)
+# make sure libglx.so of ati is used. xorg.xorgserver does provide it as well
+# which is a problem because it doesn't contain the xorgserver patch supporting
+# the XORG_DRI_DRIVER_PATH env var.
+# See http://thread.gmane.org/gmane.linux.distributions.nixos/4145 for a
+# workaround (TODO)
+
+assert xorg.xorgserver.name == "xorg-server-1.7.5";
+assert stdenv.system == "x86_64-linux"; # i686-linux should work as well - however I didn't test it.
+
+# The gentoo ebuild contains much more magic..
+
+let lib = stdenv.lib;
+    inherit (lib) concatStringsSep;
+in
+# http://wiki.cchtml.com/index.php/Main_Page
+
+stdenv.mkDerivation {
+  name = "ati-drivers";
+
+  builder = ./builder.sh;
+
+  inherit libXxf86vm xf86vidmodeproto;
+
+  src =
+    assert stdenv.system == "x86_64-linux";
+  fetchurl {
+    url = https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/ati-driver-installer-10-4-x86.x86_64.run;
+    sha256 = "1rlqbfv729lray1c72ga4528kj7v4a5nmdznbgx7izwaxip2a45z";
+  };
+
+  buildInputs = [xlibs.libXext xlibs.libX11
+    xlibs.libXrandr which imake makeWrapper
+    patchelf
+  ];
+  inherit kernel glibc /* glibc only used for setting interpreter */;
+  
+  LD_LIBRARY_PATH = concatStringsSep ":"
+    [ "${xorg.libXrandr}/lib"
+      "${xorg.libXrender}/lib"
+      "${xorg.libXext}/lib"
+      "${xorg.libX11}/lib"
+    ];
+
+  inherit mesa; # only required to build examples
+
+  meta = {
+    description = "ati drivers";
+    homepage = http://support.amd.com/us/gpudownload/Pages/index.aspx;
+    license = "unfree";
+    maintainers = [stdenv.lib.maintainers.marcweber];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}

pkgs/top-level/all-packages.nix

@@ -6291,6 +6291,12 @@ let
 
     inherit kernel;
 
+    ati_drivers_x11  = import ../os-specific/linux/ati-drivers {
+      inherit stdenv fetchurl kernel xlibs which mesa xorg makeWrapper
+        patchelf glibc;
+      inherit (xorg) imake libXxf86vm xf86vidmodeproto;
+    };
+
     aufs = import ../os-specific/linux/aufs {
       inherit fetchurl stdenv kernel;
     };