uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
24
pkgs/applications/audio/seq24/default.nix
Normal file
24
pkgs/applications/audio/seq24/default.nix
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
{ lib, stdenv, fetchurl, alsa-lib, gtkmm2, libjack2, pkg-config }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "seq24";
|
||||
version = "0.9.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://launchpad.net/seq24/trunk/${version}/+download/${pname}-${version}.tar.gz";
|
||||
sha256 = "1qpyb7355s21sgy6gibkybxpzx4ikha57a8w644lca6qy9mhcwi3";
|
||||
};
|
||||
|
||||
patches = [ ./mutex_no_nameclash.patch ];
|
||||
|
||||
buildInputs = [ alsa-lib gtkmm2 libjack2 ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Minimal loop based midi sequencer";
|
||||
homepage = "http://www.filter24.org/seq24";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ goibhniu ];
|
||||
};
|
||||
}
|
||||
58
pkgs/applications/audio/seq24/mutex_no_nameclash.patch
Normal file
58
pkgs/applications/audio/seq24/mutex_no_nameclash.patch
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
--- a/src/mutex.cpp
|
||||
+++ b/src/mutex.cpp
|
||||
@@ -20,23 +20,23 @@
|
||||
|
||||
#include "mutex.h"
|
||||
|
||||
-const pthread_mutex_t mutex::recmutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
|
||||
+const pthread_mutex_t mutex_no_nameclash::recmutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
|
||||
const pthread_cond_t condition_var::cond = PTHREAD_COND_INITIALIZER;
|
||||
|
||||
-mutex::mutex( )
|
||||
+mutex_no_nameclash::mutex_no_nameclash( )
|
||||
{
|
||||
m_mutex_lock = recmutex;
|
||||
}
|
||||
|
||||
void
|
||||
-mutex::lock( )
|
||||
+mutex_no_nameclash::lock( )
|
||||
{
|
||||
pthread_mutex_lock( &m_mutex_lock );
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
-mutex::unlock( )
|
||||
+mutex_no_nameclash::unlock( )
|
||||
{
|
||||
pthread_mutex_unlock( &m_mutex_lock );
|
||||
}
|
||||
--- a/src/mutex.h
|
||||
+++ b/src/mutex.h
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
#include <pthread.h>
|
||||
|
||||
-class mutex {
|
||||
+class mutex_no_nameclash {
|
||||
|
||||
private:
|
||||
|
||||
@@ -37,14 +37,14 @@
|
||||
|
||||
public:
|
||||
|
||||
- mutex();
|
||||
+ mutex_no_nameclash();
|
||||
|
||||
void lock();
|
||||
void unlock();
|
||||
|
||||
};
|
||||
|
||||
-class condition_var : public mutex {
|
||||
+class condition_var : public mutex_no_nameclash {
|
||||
|
||||
private:
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue