From e5b51648b1ccb218f83c5310a3b6b00ed3bdc581 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 30 Jan 2013 14:52:53 +0100
Subject: Move "darwin-native-x11-and-opengl" package into the "os-specific"
 hierarchy.

---
 pkgs/build-support/native-darwin-x11-and-opengl/default.nix | 12 ------------
 pkgs/os-specific/darwin/native-x11-and-opengl/default.nix   | 12 ++++++++++++
 pkgs/top-level/all-packages.nix                             |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)
 delete mode 100644 pkgs/build-support/native-darwin-x11-and-opengl/default.nix
 create mode 100644 pkgs/os-specific/darwin/native-x11-and-opengl/default.nix

diff --git a/pkgs/build-support/native-darwin-x11-and-opengl/default.nix b/pkgs/build-support/native-darwin-x11-and-opengl/default.nix
deleted file mode 100644
index cee03741dce..00000000000
--- a/pkgs/build-support/native-darwin-x11-and-opengl/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ stdenv, writeScript }:
-
-assert stdenv.isDarwin;
-
-stdenv.mkDerivation rec {
-  name = "darwin-native-x11-and-opengl";
-
-  builder = writeScript "${name}-builder.sh" ''
-    /bin/mkdir -p $out
-    /bin/ln -sv /usr/X11/{bin,lib,include,share} $out/
-  '';
-}
diff --git a/pkgs/os-specific/darwin/native-x11-and-opengl/default.nix b/pkgs/os-specific/darwin/native-x11-and-opengl/default.nix
new file mode 100644
index 00000000000..cee03741dce
--- /dev/null
+++ b/pkgs/os-specific/darwin/native-x11-and-opengl/default.nix
@@ -0,0 +1,12 @@
+{ stdenv, writeScript }:
+
+assert stdenv.isDarwin;
+
+stdenv.mkDerivation rec {
+  name = "darwin-native-x11-and-opengl";
+
+  builder = writeScript "${name}-builder.sh" ''
+    /bin/mkdir -p $out
+    /bin/ln -sv /usr/X11/{bin,lib,include,share} $out/
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 84b4bc48587..2b6866e553b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4590,7 +4590,7 @@ let
 
   mesaSupported = lib.elem system lib.platforms.mesaPlatforms;
 
-  darwinX11AndOpenGL = callPackage ../build-support/native-darwin-x11-and-opengl { };
+  darwinX11AndOpenGL = callPackage ../os-specific/darwin/native-x11-and-opengl { };
 
   mesa = if stdenv.isDarwin then darwinX11AndOpenGL else
     callPackage ../development/libraries/mesa { };
-- 
cgit 1.4.1