diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-28 11:48:13 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-28 18:30:46 -0400 |
| commit | a40ceb2782a0f2554f854628a3bd5d8d941677d4 (patch) | |
| tree | 657c6bcb982f6d7f43c586d1873c8a5a63e1fe1f /pkgs/development/libraries/glew | |
| parent | 5c99b2f341572b025bf1c975e8604d55ecd9955d (diff) | |
| download | nixpkgs-a40ceb2782a0f2554f854628a3bd5d8d941677d4.tar nixpkgs-a40ceb2782a0f2554f854628a3bd5d8d941677d4.tar.gz nixpkgs-a40ceb2782a0f2554f854628a3bd5d8d941677d4.tar.bz2 nixpkgs-a40ceb2782a0f2554f854628a3bd5d8d941677d4.tar.lz nixpkgs-a40ceb2782a0f2554f854628a3bd5d8d941677d4.tar.xz nixpkgs-a40ceb2782a0f2554f854628a3bd5d8d941677d4.tar.zst nixpkgs-a40ceb2782a0f2554f854628a3bd5d8d941677d4.zip | |
glew: Rely on cc-wrapper can to export these env vars
Diffstat (limited to 'pkgs/development/libraries/glew')
| -rw-r--r-- | pkgs/development/libraries/glew/1.10.nix | 14 | ||||
| -rw-r--r-- | pkgs/development/libraries/glew/default.nix | 14 |
2 files changed, 12 insertions, 16 deletions
diff --git a/pkgs/development/libraries/glew/1.10.nix b/pkgs/development/libraries/glew/1.10.nix index 9d5ded5be15..8500a54f970 100644 --- a/pkgs/development/libraries/glew/1.10.nix +++ b/pkgs/development/libraries/glew/1.10.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, mesa_glu, x11, libXmu, libXi -, AGL ? null }: +, buildPlatform, hostPlatform +, AGL ? null +}: with stdenv.lib; @@ -36,13 +38,9 @@ stdenv.mkDerivation rec { cp -r README.txt LICENSE.txt doc $out/share/doc/glew ''; - crossAttrs.makeFlags = [ - "CC=${stdenv.cross.config}-gcc" - "LD=${stdenv.cross.config}-gcc" - "AR=${stdenv.cross.config}-ar" - "STRIP=" - ] ++ optional (stdenv.cross.libc == "msvcrt") "SYSTEM=mingw" - ++ optional (stdenv.cross.libc == "libSystem") "SYSTEM=darwin"; + makeFlags = if hostPlatform == buildPlatform then null else [ + "SYSTEM=${if hostPlatform.isMinGW then "mingw" else hostPlatform.parsed.kernel}" + ]; meta = with stdenv.lib; { description = "An OpenGL extension loading library for C(++)"; diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index 02c87cf709a..f8df5d5baf0 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, mesa_glu, xlibsWrapper, libXmu, libXi }: +{ stdenv, fetchurl, mesa_glu, xlibsWrapper, libXmu, libXi +, buildPlatform, hostPlatform +}: with stdenv.lib; @@ -37,13 +39,9 @@ stdenv.mkDerivation rec { rm $out/lib/*.a ''; - crossAttrs.makeFlags = [ - "CC=${stdenv.cross.config}-gcc" - "LD=${stdenv.cross.config}-gcc" - "AR=${stdenv.cross.config}-ar" - "STRIP=" - ] ++ optional (stdenv.cross.libc == "msvcrt") "SYSTEM=mingw" - ++ optional (stdenv.cross.libc == "libSystem") "SYSTEM=darwin"; + makeFlags = if hostPlatform == buildPlatform then null else [ + "SYSTEM=${if hostPlatform.isMinGW then "mingw" else hostPlatform.parsed.kernel}" + ]; meta = with stdenv.lib; { description = "An OpenGL extension loading library for C(++)"; |