summary refs log tree commit diff
path: root/pkgs/applications/audio/lash
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2013-02-23 21:12:24 +0100
committerVladimír Čunát <vcunat@gmail.com>2013-02-23 21:12:24 +0100
commite02153a3c0940ddc278f13e7df82623931496649 (patch)
treed21c1de6a20e90d3d54eefc0f0922ec1f7abbd3f /pkgs/applications/audio/lash
parente469bc503ef7cf9c8f27ba81aa8f9e3df2db2990 (diff)
downloadnixpkgs-e02153a3c0940ddc278f13e7df82623931496649.tar
nixpkgs-e02153a3c0940ddc278f13e7df82623931496649.tar.gz
nixpkgs-e02153a3c0940ddc278f13e7df82623931496649.tar.bz2
nixpkgs-e02153a3c0940ddc278f13e7df82623931496649.tar.lz
nixpkgs-e02153a3c0940ddc278f13e7df82623931496649.tar.xz
nixpkgs-e02153a3c0940ddc278f13e7df82623931496649.tar.zst
nixpkgs-e02153a3c0940ddc278f13e7df82623931496649.zip
lash: fix for new gcc
Diffstat (limited to 'pkgs/applications/audio/lash')
-rw-r--r--pkgs/applications/audio/lash/default.nix3
-rw-r--r--pkgs/applications/audio/lash/gcc-47.patch11
2 files changed, 13 insertions, 1 deletions
diff --git a/pkgs/applications/audio/lash/default.nix b/pkgs/applications/audio/lash/default.nix
index 3bbc9e4277b..72087c76b05 100644
--- a/pkgs/applications/audio/lash/default.nix
+++ b/pkgs/applications/audio/lash/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation  rec {
     sha256 = "05kc4brcx8mncai0rj2gz4s4bsrsy9q8xlnaddf75i0m8jl7snhh";
   };
 
-  patches = [ ./socket.patch ];
+  # http://permalink.gmane.org/gmane.linux.redhat.fedora.extras.cvs/822346
+  patches = [ ./socket.patch ./gcc-47.patch ];
 
   buildInputs = [ alsaLib gtk jackaudio libuuid libxml2 makeWrapper
     pkgconfig readline ];
diff --git a/pkgs/applications/audio/lash/gcc-47.patch b/pkgs/applications/audio/lash/gcc-47.patch
new file mode 100644
index 00000000000..774add431fa
--- /dev/null
+++ b/pkgs/applications/audio/lash/gcc-47.patch
@@ -0,0 +1,11 @@
+diff -rupN liblash/lash.c lash-0.5.4/liblash/lash.c
+--- a/liblash/lash.c	2007-03-09 10:34:40.000000000 -0500
++++ b/liblash/lash.c	2012-07-22 18:17:46.003963521 -0400
+@@ -22,6 +22,7 @@
+ #include <string.h>
+ #include <strings.h>
+ #include <pthread.h>
++#include <sys/resource.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ #include <sys/socket.h>