From c236ffecad33995f6a3194ee9367dc488e827b1c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 20 Nov 2019 17:01:43 -0800 Subject: [PATCH] gamecube-tools: fix build GL/gl.h was removed from mesa package, needs to be directly imported from libGL now --- pkgs/development/tools/gamecube-tools/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/gamecube-tools/default.nix b/pkgs/development/tools/gamecube-tools/default.nix index 872c8fae527d..7c31f691b4e8 100644 --- a/pkgs/development/tools/gamecube-tools/default.nix +++ b/pkgs/development/tools/gamecube-tools/default.nix @@ -1,21 +1,20 @@ -{ stdenv, which, autoconf, automake, fetchFromGitHub, - libtool, freeimage, mesa }: +{ stdenv, fetchFromGitHub, autoreconfHook +, freeimage, libGL }: + stdenv.mkDerivation rec { - version = "v1.0.2"; + version = "1.0.2"; pname = "gamecube-tools"; - nativeBuildInputs = [ which autoconf automake libtool ]; - buildInputs = [ freeimage mesa ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ freeimage libGL ]; src = fetchFromGitHub { owner = "devkitPro"; repo = "gamecube-tools"; - rev = version; + rev = "v${version}"; sha256 = "0zvpkzqvl8iv4ndzhkjkmrzpampyzgb91spv0h2x2arl8zy4z7ca"; }; - preConfigure = "./autogen.sh"; - meta = with stdenv.lib; { description = "Tools for gamecube/wii projects"; homepage = "https://github.com/devkitPro/gamecube-tools/";