From f9526cd7f15e8deb0c5c8ec1208ca8d3b4742251 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
<viric@vicerveza.homeunix.net>
Date: Thu, 3 May 2012 09:38:36 +0000
Subject: [PATCH] Adding coriander. I don't know how to make its gconf thing
work, so it shows a warning at gui start.
svn path=/nixpkgs/trunk/; revision=33976
---
pkgs/applications/video/coriander/default.nix | 24 +++++++++++++++++++
pkgs/top-level/all-packages.nix | 4 ++++
2 files changed, 28 insertions(+)
create mode 100644 pkgs/applications/video/coriander/default.nix
diff --git a/pkgs/applications/video/coriander/default.nix b/pkgs/applications/video/coriander/default.nix
new file mode 100644
index 000000000000..01abe86ae2cb
--- /dev/null
+++ b/pkgs/applications/video/coriander/default.nix
@@ -0,0 +1,24 @@
+{stdenv, fetchurl, pkgconfig, glib, gtk, libgnomeui, libXv, libraw1394, libdc1394
+, SDL, automake, GConf }:
+
+stdenv.mkDerivation rec {
+ name = "coriander-2.0.1";
+
+ src = fetchurl {
+ url = "http://damien.douxchamps.net/ieee1394/coriander/archives/coriander-2.0.1.tar.gz";
+ sha256 = "0l6hpfgy5r4yardilmdrggsnn1fbfww516sk5a90g1740cd435x5";
+ };
+
+ preConfigure = ''
+ cp ${automake}/share/automake-*/mkinstalldirs .
+ '';
+
+ buildInputs = [ pkgconfig glib gtk libgnomeui libXv libraw1394 libdc1394 SDL GConf ];
+
+ meta = {
+ homepage = http://damien.douxchamps.net/ieee1394/coriander/;
+ description = "GUI for controlling a Digital Camera through the IEEE1394 bus";
+ maintainers = with stdenv.lib.maintainers; [viric];
+ platforms = with stdenv.lib.platforms; linux;
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e112c9081961..bea7bb723b95 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6471,6 +6471,10 @@ let
compizconfig_python = callPackage ../applications/window-managers/compiz/config-python.nix { };
+ coriander = callPackage ../applications/video/coriander {
+ inherit (gnome) libgnomeui GConf;
+ };
+
libcompizconfig = callPackage ../applications/window-managers/compiz/libcompizconfig.nix { };
compiz_bcop = callPackage ../applications/window-managers/compiz/bcop.nix { };