From e312c443fcf94a0e77a7a102fe35dadc1fabc107 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 1 Jul 2010 05:05:47 +0000
Subject: [PATCH] Fixing interpreter paths in the end. Note that 4s-dump needs
 Perl Net::HTTP package that Nixpkgs apparently lack

svn path=/nixpkgs/trunk/; revision=22435
---
 pkgs/servers/http/4store/default.nix | 6 +++++-
 pkgs/top-level/all-packages.nix      | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/4store/default.nix b/pkgs/servers/http/4store/default.nix
index 5a31bddc433..f5a8aab9850 100644
--- a/pkgs/servers/http/4store/default.nix
+++ b/pkgs/servers/http/4store/default.nix
@@ -3,6 +3,7 @@ x@{builderDefsPackage
   glib, libxml2, pcre, avahi,
   readline, ncurses, expat,
   zlib, pkgconfig, which,
+  perl,
   db_dir ? "/var/lib/4store"
   , ...}:
 builderDefsPackage
@@ -21,7 +22,8 @@ rec {
   inherit buildInputs;
 
   /* doConfigure should be removed if not needed */
-  phaseNames = ["doFixConfigure" "doConfigure" "doMakeInstall"];
+  phaseNames = ["doFixConfigure" "doConfigure" "doMakeInstall"
+    "fixInterpreter"];
 
   doFixConfigure = a.fullDepEntry ''
     sed -e 's@#! */bin/bash@#! ${a.stdenv.shell}@' -i configure
@@ -30,6 +32,8 @@ rec {
     
     sed -e 's@/var/lib/4store@${db_dir}@g' -i src/common/params.h src/utilities/*
   '' ["minInit" "doUnpack"];
+
+  fixInterpreter = (a.doPatchShebangs "$out/bin");
       
   meta = {
     description = "SparQL query server (RDF storage)";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 052dfa23fca..60a99d02765 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5758,7 +5758,7 @@ let
 
   rdf4store = import ../servers/http/4store {
     inherit builderDefsPackage librdf_raptor librdf_rasqal libxml2
-      pcre avahi readline ncurses expat zlib pkgconfig which;
+      pcre avahi readline ncurses expat zlib pkgconfig which perl;
     inherit (gtkLibs) glib;
   };