diff --git a/pkgs/applications/version-management/monotone-viz/1.0.1.nix b/pkgs/applications/version-management/monotone-viz/1.0.1.nix new file mode 100644 index 000000000000..7f0b4e727246 --- /dev/null +++ b/pkgs/applications/version-management/monotone-viz/1.0.1.nix @@ -0,0 +1,19 @@ +args : with args; +rec { + src = fetchurl { + url = http://oandrieu.nerim.net/monotone-viz/monotone-viz-1.0.1-nolablgtk.tar.gz; + sha256 = "0aqz65mlqplj5ccr8czcr6hvliclf9y1xi1rrs2z2s3fvahasxnp"; + }; + + buildInputs = [ocaml lablgtk libgnomecanvas gtk graphviz glib pkgconfig]; + configureFlags = ["--with-lablgtk-dir=${lablgtk}/lib/ocaml/lablgtk2"]; + + /* doConfigure should be specified separately */ + phaseNames = ["doConfigure" "doMakeInstall"]; + + name = "monotone-viz-" + version; + meta = { + description = "Monotone commit tree visualizer"; + }; +} + diff --git a/pkgs/development/libraries/lablgtk/default.nix b/pkgs/development/libraries/lablgtk/default.nix index 12728717e82c..bd34f6bb93cc 100644 --- a/pkgs/development/libraries/lablgtk/default.nix +++ b/pkgs/development/libraries/lablgtk/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, pkgconfig, gtk}: +{stdenv, fetchurl, ocaml, pkgconfig, gtk, libgnomecanvas}: stdenv.mkDerivation { name = "lablgtk-2.6.0"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "3694bc1e288ce0903af6c96a2790d2340ba38fa51b18090062ede75137d97876"; }; - buildInputs = [ocaml pkgconfig gtk]; + buildInputs = [ocaml pkgconfig gtk libgnomecanvas]; configureFlags = "--with-libdir=$(out)/lib/ocaml"; buildFlags = "world"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8869a160e09..9f60834446c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1644,6 +1644,11 @@ let pkgs = rec { inherit stdenv fetchurl boost zlib; }; + monotoneViz = builderDefsPackage (selectVersion ../applications/version-management/monotone-viz "1.0.1") { + inherit ocaml lablgtk graphviz pkgconfig; + inherit (gnome) gtk libgnomecanvas glib; + } null; + nasm = import ../development/compilers/nasm { inherit fetchurl stdenv; }; @@ -2746,6 +2751,7 @@ let pkgs = rec { lablgtk = import ../development/libraries/lablgtk { inherit fetchurl stdenv ocaml pkgconfig; inherit (gtkLibs) gtk; + inherit (gnome) libgnomecanvas; }; lcms = import ../development/libraries/lcms {