diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2008-01-16 00:06:31 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2008-01-16 00:06:31 +0000 |
| commit | 9e0a64295596252ce20d9bae1c19e19f668639ca (patch) | |
| tree | 010381189566413c768578737f1b1de49dd1dd5d /pkgs/development/libraries/freeglut | |
| parent | 6e8ff2b24bb056733067995dc6dd16452184d7a1 (diff) | |
| download | nixpkgs-9e0a64295596252ce20d9bae1c19e19f668639ca.tar nixpkgs-9e0a64295596252ce20d9bae1c19e19f668639ca.tar.gz nixpkgs-9e0a64295596252ce20d9bae1c19e19f668639ca.tar.bz2 nixpkgs-9e0a64295596252ce20d9bae1c19e19f668639ca.tar.lz nixpkgs-9e0a64295596252ce20d9bae1c19e19f668639ca.tar.xz nixpkgs-9e0a64295596252ce20d9bae1c19e19f668639ca.tar.zst nixpkgs-9e0a64295596252ce20d9bae1c19e19f668639ca.zip | |
freeglut: gcc-4.2 related patch
svn path=/nixpkgs/branches/stdenv-updates/; revision=10159
Diffstat (limited to 'pkgs/development/libraries/freeglut')
| -rw-r--r-- | pkgs/development/libraries/freeglut/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/libraries/freeglut/freeglut-gcc-4.2.patch | 13 |
2 files changed, 14 insertions, 0 deletions
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; + |