gollum: Add Git as runtime dependency

Now "nix-shell -p gollum --pure --run gollum" should work properly.

1 files changed, 21 insertions, 10 deletions

diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/applications/misc/gollum/default.nix
index db401a2dbdc..160b38463b6 100644
--- a/pkgs/applications/misc/gollum/default.nix
+++ b/pkgs/applications/misc/gollum/default.nix
@@ -1,17 +1,28 @@
-{ stdenv, lib, bundlerEnv, ruby
-, icu, zlib }:
+{ stdenv, bundlerEnv, ruby, makeWrapper
+, git }:
 
-bundlerEnv rec {
-  name = "gollum-${version}";
-  version = (import gemset).gollum.version;
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "gollum";
+  version = (import ./gemset.nix).gollum.version;
 
-  inherit ruby;
-  gemdir = ./.;
-  gemset = ./gemset.nix;
+  nativeBuildInputs = [ makeWrapper ];
 
-  # FIXME: Add Git as runtime dependency.
+  env = bundlerEnv {
+    name = "${name}-gems";
+    inherit pname ruby;
+    gemdir = ./.;
+  };
+
+  phases = [ "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    makeWrapper ${env}/bin/gollum $out/bin/gollum \
+      --prefix PATH ":" ${stdenv.lib.makeBinPath [ git ]}
+  '';
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     description = "A simple, Git-powered wiki";
     homepage = "https://github.com/gollum/gollum";
     license = licenses.mit;