From e460a3f37c6720e608fabb96357ae48d91f247ae Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 Jan 2013 19:30:32 +0100 Subject: [PATCH] pkgs/build-support/native-darwin-x11-and-opengl: lift native X11 and OpenGL implementation from Darwin into the Nix store --- .../native-darwin-x11-and-opengl/default.nix | 12 ++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/build-support/native-darwin-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 new file mode 100644 index 00000000000..cee03741dce --- /dev/null +++ b/pkgs/build-support/native-darwin-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 8b676f49909..199bb58371e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4587,6 +4587,8 @@ let mesaSupported = lib.elem system lib.platforms.mesaPlatforms; + darwinX11AndOpenGL = callPackage ../build-support/native-darwin-x11-and-opengl { }; + mesa = callPackage ../development/libraries/mesa { }; metaEnvironment = recurseIntoAttrs (let callPackage = newScope pkgs.metaEnvironment; in rec {