From 9e0a64295596252ce20d9bae1c19e19f668639ca Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 16 Jan 2008 00:06:31 +0000 Subject: freeglut: gcc-4.2 related patch svn path=/nixpkgs/branches/stdenv-updates/; revision=10159 --- pkgs/development/libraries/freeglut/default.nix | 1 + pkgs/development/libraries/freeglut/freeglut-gcc-4.2.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/development/libraries/freeglut/freeglut-gcc-4.2.patch (limited to 'pkgs/development/libraries/freeglut') diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix index 704dc0005fb..19720b9d677 100644 --- a/pkgs/development/libraries/freeglut/default.nix +++ b/pkgs/development/libraries/freeglut/default.nix @@ -9,4 +9,5 @@ stdenv.mkDerivation { }; buildInputs = [x11 mesa]; + patches = ./freeglut-gcc-4.2.patch; } diff --git a/pkgs/development/libraries/freeglut/freeglut-gcc-4.2.patch b/pkgs/development/libraries/freeglut/freeglut-gcc-4.2.patch new file mode 100644 index 00000000000..1642affba91 --- /dev/null +++ b/pkgs/development/libraries/freeglut/freeglut-gcc-4.2.patch @@ -0,0 +1,13 @@ +diff -urN freeglut-2.4.0.old/src/freeglut_joystick.c freeglut-2.4.0/src/freeglut_joystick.c +--- freeglut-2.4.0.old/src/freeglut_joystick.c 2007-06-16 03:51:41.000000000 +0000 ++++ freeglut-2.4.0/src/freeglut_joystick.c 2007-06-16 03:54:27.000000000 +0000 +@@ -1682,9 +1682,6 @@ + + fgInitialiseJoysticks (); + +- if ( !fgJoystick ) +- return 0; +- + if ( !fgState.JoysticksInitialised ) + return 0; + -- cgit 1.4.1