From cf26f610aa56269ac9c73096c351b77aac00a74d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Sep 2016 17:23:31 +0200 Subject: [PATCH] glew: Use separate outputs and don't install static libraries --- pkgs/development/libraries/glew/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index 6595d97b01a..89bd7e918fd 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1iwb2a6wfhkzv6fa7zx2gz1lkwa0iwnd9ka1im5vdc44xm4dq9da"; }; + outputs = [ "bin" "out" "dev" "doc" ]; + nativeBuildInputs = [ xlibsWrapper libXmu libXi ]; propagatedNativeBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h @@ -24,7 +26,7 @@ stdenv.mkDerivation rec { installFlags = [ "install.all" ]; preInstall = '' - export GLEW_DEST="$out" + makeFlagsArray+=(GLEW_DEST=$out BINDIR=$bin/bin INCDIR=$dev/include/GL) ''; postInstall = '' @@ -32,6 +34,7 @@ stdenv.mkDerivation rec { mkdir -p $out/lib/pkgconfig cp glew*.pc $out/lib/pkgconfig cp -r README.txt LICENSE.txt doc $out/share/doc/glew + rm $out/lib/*.a ''; crossAttrs.makeFlags = [