mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-20 04:31:52 +00:00
Code Issues Wiki Activity

hydrogen: 0.9.5.1 -> 0.9.6

Browse source
This commit is contained in:
Cillian de Róiste 2014-08-31 16:09:08 +02:00
parent cdb3e6fa2f
commit 933bca648f
2 changed files with 6 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
pkgs/applications/audio/hydrogen/default.nix
View file

@ -1,35 +1,19 @@
{ stdenv, fetchurl, alsaLib, boost, glib, jack2, ladspaPlugins
, libarchive, liblrdf , libsndfile, pkgconfig, qt4, scons, subversion }:
{ stdenv, fetchurl, alsaLib, boost, cmake, glib, jack2, libarchive
, liblrdf, libsndfile, pkgconfig, qt4 }:
stdenv.mkDerivation rec {
version = "0.9.5.1";
version = "0.9.6";
name = "hydrogen-${version}";
src = fetchurl {
url = "mirror://sourceforge/hydrogen/hydrogen-${version}.tar.gz";
sha256 = "1fvyp6gfzcqcc90dmaqbm11p272zczz5pfz1z4lj33nfr7z0bqgb";
url = "https://github.com/hydrogen-music/hydrogen/archive/${version}.tar.gz";
sha256 = "1z7j8aq158mp41iv78j0w6fyx98y1y51z592b4x5hkvicabgck5w";
};
buildInputs = [
alsaLib boost glib jack2 ladspaPlugins libarchive liblrdf
libsndfile pkgconfig qt4 scons subversion
alsaLib boost cmake glib jack2 libarchive liblrdf libsndfile pkgconfig qt4
];
patches = [ ./scons-env.patch ];
postPatch = ''
sed -e 's#/usr/lib/ladspa#${ladspaPlugins}/lib/ladspa#' -i libs/hydrogen/src/preferences.cpp
sed '/\/usr/d' -i libs/hydrogen/src/preferences.cpp
sed "s#pkg_ver.rstrip().split('.')#pkg_ver.rstrip().split('.')[:3]#" -i Sconstruct
'';
# why doesn't scons find librdf?
buildPhase = ''
scons prefix=$out libarchive=1 lrdf=0 install
'';
installPhase = ":";
meta = with stdenv.lib; {
description = "Advanced drum machine";
homepage = http://www.hydrogen-music.org;

28
pkgs/applications/audio/hydrogen/scons-env.patch
View file

@ -1,28 +0,0 @@
--- hydrogen-0.9.5/Sconstruct 2011-03-15 13:22:35.000000000 +0100
+++ hydrogen-0.9.5/Sconstruct 2011-04-17 16:06:54.000000000 +0200
@@ -178,7 +178,7 @@
includes.append( "libs/hydrogen/include" )
- env = Environment( options = opts )
+ env = Environment( options = opts, ENV = os.environ )
#location of qt4.py
@@ -298,7 +298,6 @@
for N in glob.glob('./data/i18n/hydrogen.*'):
env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data/i18n', source=N))
- env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data', source="./data/img"))
#add every img in ./data/img to the install list.
os.path.walk("./data/img/",install_images,env)
@@ -379,7 +379,7 @@
includes, a , b = get_platform_flags( opts )
-env = Environment(options = opts, CPPPATH = includes)
+env = Environment(options = opts, ENV = os.environ)
Help(opts.GenerateHelpText(env))