about summary refs log tree commit diff
path: root/pkgs/servers/x11
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2016-01-05 10:28:58 +0100
committerVladimír Čunát <vcunat@gmail.com>2016-01-05 10:28:58 +0100
commitb1acaffe67afd838900fe22ad35cf0dda24eff63 (patch)
treefacc558b711b96b0d302fe070963e696e17fa2f3 /pkgs/servers/x11
parent556a28908e01ca1d44962d8570b5e73be949eca6 (diff)
parentb054851d18585daf67626d92b03fab418c590840 (diff)
downloadnixlib-b1acaffe67afd838900fe22ad35cf0dda24eff63.tar
nixlib-b1acaffe67afd838900fe22ad35cf0dda24eff63.tar.gz
nixlib-b1acaffe67afd838900fe22ad35cf0dda24eff63.tar.bz2
nixlib-b1acaffe67afd838900fe22ad35cf0dda24eff63.tar.lz
nixlib-b1acaffe67afd838900fe22ad35cf0dda24eff63.tar.xz
nixlib-b1acaffe67afd838900fe22ad35cf0dda24eff63.tar.zst
nixlib-b1acaffe67afd838900fe22ad35cf0dda24eff63.zip
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/servers/x11')
-rw-r--r--pkgs/servers/x11/xorg/replacements.nix21
1 files changed, 0 insertions, 21 deletions
diff --git a/pkgs/servers/x11/xorg/replacements.nix b/pkgs/servers/x11/xorg/replacements.nix
deleted file mode 100644
index 175d05b0a364..000000000000
--- a/pkgs/servers/x11/xorg/replacements.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{stdenv, fetchurl, xorg, automake, autoconf, libtool, makeOverridable}:
-{
-  xf86videoati = {src, suffix}: 
-  makeOverridable stdenv.mkDerivation {
-      name = "xf86-video-ati-${suffix}";
-      buildInputs = xorg.xf86videoati.buildInputs ++
-         [autoconf automake libtool];
-      builder = ./builder.sh;
-      inherit src;
-      preConfigure = ''
-        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DPACKAGE_VERSION_MAJOR=6"
-        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DPACKAGE_VERSION_MINOR=9"
-        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DPACKAGE_VERSION_PATCHLEVEL=999"
-
-        sed -e 's/@DRIVER_MAN_SUFFIX@/man/g' -i man/Makefile.am
-        export DRIVER_MAN_DIR=$out/share/man/man5 
-
-        ./autogen.sh
-      '';
-  };
-}