public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #22457 from peterhoeg/u/suil

Browse Source 
suil: 0.8.2 -> 0.8.4
This commit is contained in:
Graham Christensen 2017-02-12 19:00:21 -05:00 committed by GitHub
commit 63d7ff883e
3 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/audio/ingen/default.nix
View File

@ -5,12 +5,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ingen-unstable-${rev}"; name = "ingen-unstable-${rev}";
rev = "2016-10-29"; rev = "2017-01-18";
src = fetchgit { src = fetchgit {
url = "http://git.drobilla.net/cgit.cgi/ingen.git"; url = "http://git.drobilla.net/cgit.cgi/ingen.git";
rev = "fd147d0b888090bfb897505852c1f25dbdf77e18"; rev = "02ae3e9d8bf3f6a5e844706721aad8c0ac9f4340";
sha256 = "1qmg79962my82c43vyrv5sxbqci9c7gc2s9bwaaqd0fcf08xcz1z"; sha256 = "15s8nrzn68hc2s6iw0zshbz3lfnsq0mr6gflq05xm911b7xbp74k";
}; };
buildInputs = [ buildInputs = [

23
pkgs/development/libraries/audio/suil/default.nix
View File

@ -1,15 +1,24 @@
{ stdenv, fetchurl, gtk2, lv2, pkgconfig, python, serd, sord, sratom, qt4 }: { stdenv, lib, fetchurl, gtk2, lv2, pkgconfig, python, serd, sord, sratom
, withQt4 ? true, qt4 ? null
, withQt5 ? false, qt5 ? null }:
# I haven't found an XOR operator in nix...
assert withQt4 || withQt5;
assert !(withQt4 && withQt5);
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "suil-${version}"; pname = "suil";
version = "0.8.2"; version = "0.8.4";
name = "${pname}-qt${if withQt4 then "4" else "5"}-${version}";
src = fetchurl { src = fetchurl {
url = "http://download.drobilla.net/${name}.tar.bz2"; url = "http://download.drobilla.net/${pname}-${version}.tar.bz2";
sha256 = "1s3adyiw7sa5gfvm5wasa61qa23629kprxyv6w8hbxdiwp0hhxkq"; sha256 = "1kji3lhha26qr6xm9j8ic5c40zbrrb5qnwm2qxzmsfxgmrz29wkf";
}; };
buildInputs = [ gtk2 lv2 pkgconfig python qt4 serd sord sratom ]; buildInputs = [ gtk2 lv2 pkgconfig python serd sord sratom ]
++ (lib.optionals withQt4 [ qt4 ])
++ (lib.optionals withQt5 (with qt5; [ qtbase qttools ]));
configurePhase = "python waf configure --prefix=$out"; configurePhase = "python waf configure --prefix=$out";
@ -21,7 +30,7 @@ stdenv.mkDerivation rec {
homepage = http://drobilla.net/software/suil; homepage = http://drobilla.net/software/suil;
description = "A lightweight C library for loading and wrapping LV2 plugin UIs"; description = "A lightweight C library for loading and wrapping LV2 plugin UIs";
license = licenses.mit; license = licenses.mit;
maintainers = [ maintainers.goibhniu ]; maintainers = with maintainers; [ goibhniu ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

12
pkgs/top-level/all-packages.nix
View File

@ -9593,7 +9593,17 @@ with pkgs;
subtitleeditor = callPackage ../applications/video/subtitleeditor { }; subtitleeditor = callPackage ../applications/video/subtitleeditor { };
suil = callPackage ../development/libraries/audio/suil { }; suil-qt4 = callPackage ../development/libraries/audio/suil {
withQt4 = true;
withQt5 = false;
};
suil-qt5 = callPackage ../development/libraries/audio/suil {
withQt4 = false;
withQt5 = true;
};
suil = suil-qt4;
sutils = callPackage ../tools/misc/sutils { }; sutils = callPackage ../tools/misc/sutils { };