diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-08-29 14:04:47 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-08-29 14:04:47 +0200 |
| commit | fa7dcd19318be6ba325f617cd07b6e2fffb42302 (patch) | |
| tree | 18f3d964bd907b99c1c5eb62e8f33ccf741e313a /pkgs/development/libraries/ois | |
| parent | 1cddbc4bb498341591ed5bc2e7142384036dfdcf (diff) | |
| download | nixpkgs-fa7dcd19318be6ba325f617cd07b6e2fffb42302.tar nixpkgs-fa7dcd19318be6ba325f617cd07b6e2fffb42302.tar.gz nixpkgs-fa7dcd19318be6ba325f617cd07b6e2fffb42302.tar.bz2 nixpkgs-fa7dcd19318be6ba325f617cd07b6e2fffb42302.tar.lz nixpkgs-fa7dcd19318be6ba325f617cd07b6e2fffb42302.tar.xz nixpkgs-fa7dcd19318be6ba325f617cd07b6e2fffb42302.tar.zst nixpkgs-fa7dcd19318be6ba325f617cd07b6e2fffb42302.zip | |
ois: fix build with gcc>=4.7 via a Gentoo patch
Diffstat (limited to 'pkgs/development/libraries/ois')
| -rw-r--r-- | pkgs/development/libraries/ois/default.nix | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/pkgs/development/libraries/ois/default.nix b/pkgs/development/libraries/ois/default.nix index abf6c7112a5..67df3645eb9 100644 --- a/pkgs/development/libraries/ois/default.nix +++ b/pkgs/development/libraries/ois/default.nix @@ -1,4 +1,4 @@ -x@{builderDefsPackage +x@{builderDefsPackage, fetchurl , autoconf, automake, libtool, m4 , libX11, xproto, libXi, inputproto , libXaw, libXmu, libXt @@ -30,10 +30,17 @@ rec { inherit (sourceInfo) name version; inherit buildInputs; - phaseNames = ["doConfigure" "doMakeInstall"]; + phaseNames = ["doPatch" "doConfigure" "doMakeInstall"]; + + patches = [(fetchurl { + url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-games/ois/files/ois-1.3-gcc47.patch; + sha256 = "026jw06n42bcrmg0sbdhzc4cqxsnf7fw30a2z9cigd9x282zhii8"; + name = "gcc47.patch"; + })]; + patchFlags = "-p0"; configureCommand = ''sh bootstrap; sh configure''; - + meta = { description = "Object-oriented C++ input system"; maintainers = with a.lib.maintainers; |