From 0d4843a38871e9addb9e9c19dd94c4fec4783c63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <cillian.deroiste@gmail.com>
Date: Sun, 7 Dec 2014 15:37:51 +0100
Subject: [PATCH] ingen: update from 5464 to 5490, use default boost, wrap
 python scripts

---
 pkgs/applications/audio/ingen/default.nix | 22 ++++++++++++++++------
 pkgs/top-level/all-packages.nix           |  2 +-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix
index 450b57a68195..d4abbbe00834 100644
--- a/pkgs/applications/audio/ingen/default.nix
+++ b/pkgs/applications/audio/ingen/default.nix
@@ -1,27 +1,37 @@
 { stdenv, fetchsvn, boost, ganv, glibmm, gtk, gtkmm, jack2, lilv
-, lv2, pkgconfig, python, raul, serd, sord, sratom, suil
+, lv2, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord, sratom
+, suil
 }:
 
 stdenv.mkDerivation  rec {
   name = "ingen-svn-${rev}";
-  rev = "5464";
+  rev = "5490";
 
   src = fetchsvn {
     url = "http://svn.drobilla.net/lad/trunk/ingen";
     rev = rev;
-    sha256 = "1p5rsxwanpj3kj5yai7zqbharj2ldvn78x3p739vkgpr3dinp506";
+    sha256 = "09h2mrkzpwzhhyqy21xr7jhfbl82gmqfyj0lzhnjsrab8z56yzk6";
   };
 
   buildInputs = [
-    boost ganv glibmm gtk gtkmm jack2 lilv lv2 pkgconfig python
-    raul serd sord sratom suil
+    boost ganv glibmm gtk gtkmm jack2 lilv lv2 makeWrapper pkgconfig
+    python raul serd sord sratom suil
   ];
 
   configurePhase = "python waf configure --prefix=$out";
 
+  propagatedBuildInputs = [ rdflib ];
+
   buildPhase = "python waf";
 
-  installPhase = "python waf install";
+  installPhase = ''
+    python waf install
+    for program in ingenams ingenish
+    do
+      wrapProgram $out/bin/$program \
+        --prefix PYTHONPATH : $out/lib/python${python.majorVersion}/site-packages:$PYTHONPATH
+    done
+  '';
 
   meta = with stdenv.lib; {
     description = "A modular audio processing system using JACK and LV2 or LADSPA plugins";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d24ed182412f..205f6758df68 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11554,7 +11554,7 @@ let
   icbm3d = callPackage ../games/icbm3d { };
 
   ingen = callPackage ../applications/audio/ingen {
-    boost = boost155;
+    inherit (pythonPackages) rdflib;
   };
 
   instead = callPackage ../games/instead {