From b559020e27ba07676e5bc7b2256fa5b84809bba2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 4 Jan 2016 10:31:58 +0100
Subject: [PATCH] xorgReplacements: remove this ancient cruft
---
pkgs/servers/x11/xorg/replacements.nix | 21 ---------------------
pkgs/top-level/all-packages.nix | 2 --
2 files changed, 23 deletions(-)
delete mode 100644 pkgs/servers/x11/xorg/replacements.nix
diff --git a/pkgs/servers/x11/xorg/replacements.nix b/pkgs/servers/x11/xorg/replacements.nix
deleted file mode 100644
index 175d05b0a36..00000000000
--- 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
- '';
- };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 25e65c43119..d6b6ee289c0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9626,8 +9626,6 @@ let
libdrm = if stdenv.isLinux then libdrm else null;
} // { inherit xlibsWrapper; } );
- xorgReplacements = callPackage ../servers/x11/xorg/replacements.nix { };
-
xorgVideoUnichrome = callPackage ../servers/x11/xorg/unichrome/default.nix { };
xwayland = callPackage ../servers/x11/xorg/xwayland.nix { };