diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-23 09:02:10 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-23 09:02:10 +0200 |
| commit | 0b192a09767c05b38f3e2838c07e9600318bbbb5 (patch) | |
| tree | 4467053c39ef4bad71527cd5fda5cf92960575e8 /pkgs/os-specific/linux/ati-drivers/builder.sh | |
| parent | dc5bbc4700dd95420f87141efcc0e6cb48a710f9 (diff) | |
| parent | 0e54c749114b79f6be78486086f5829b176fcba8 (diff) | |
| download | nixpkgs-0b192a09767c05b38f3e2838c07e9600318bbbb5.tar nixpkgs-0b192a09767c05b38f3e2838c07e9600318bbbb5.tar.gz nixpkgs-0b192a09767c05b38f3e2838c07e9600318bbbb5.tar.bz2 nixpkgs-0b192a09767c05b38f3e2838c07e9600318bbbb5.tar.lz nixpkgs-0b192a09767c05b38f3e2838c07e9600318bbbb5.tar.xz nixpkgs-0b192a09767c05b38f3e2838c07e9600318bbbb5.tar.zst nixpkgs-0b192a09767c05b38f3e2838c07e9600318bbbb5.zip | |
Merge branch 'master' into staging
That's to get mesa rebuild from master, as it's nontrivial.
Diffstat (limited to 'pkgs/os-specific/linux/ati-drivers/builder.sh')
| -rw-r--r-- | pkgs/os-specific/linux/ati-drivers/builder.sh | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/ati-drivers/builder.sh b/pkgs/os-specific/linux/ati-drivers/builder.sh index b9f6ed22cba..2b907bde10a 100644 --- a/pkgs/os-specific/linux/ati-drivers/builder.sh +++ b/pkgs/os-specific/linux/ati-drivers/builder.sh @@ -9,6 +9,10 @@ unzip $src run_file=fglrx-$build/amd-driver-installer-$build-x86.x86_64.run sh $run_file --extract . +for patch in $patches;do + patch -p1 < $patch +done + case "$system" in x86_64-linux) arch=x86_64 @@ -238,6 +242,7 @@ if test -z "$libsOnly"; then tar xfz ../common/usr/src/ati/fglrx_sample_source.tgz eval "$patchPhaseSamples" + ( # build and install fgl_glxgears cd fgl_glxgears; gcc -DGL_ARB_texture_multisample=1 -g \ @@ -258,10 +263,10 @@ if test -z "$libsOnly"; then cd programs/fglrx_gamma gcc -fPIC -I${libXxf86vm.dev}/include \ - -I${xf86vidmodeproto}/include \ - -I$out/X11R6/include \ - -L$out/lib \ - -Wall -lm -lfglrx_gamma -lX11 -lXext -o $out/bin/fglrx_xgamma fglrx_xgamma.c + -I${xf86vidmodeproto}/include \ + -I$out/X11R6/include \ + -L$out/lib \ + -Wall -lm -lfglrx_gamma -lX11 -lXext -o $out/bin/fglrx_xgamma fglrx_xgamma.c ) { |