Author: raskin
Date: 2010-07-01 05:05:47 +0000 (Thu, 01 Jul 2010)
New Revision: 22435

You can view the changes in this commit at:
   https://svn.nixos.org/viewvc/nix?rev=22435&view=rev

Modified:
   nixpkgs/trunk/pkgs/servers/http/4store/default.nix
   nixpkgs/trunk/pkgs/top-level/all-packages.nix

Log:
Fixing interpreter paths in the end. Note that 4s-dump needs Perl Net::HTTP 
package that Nixpkgs apparently lack

Changes:

Modified: nixpkgs/trunk/pkgs/servers/http/4store/default.nix
===================================================================
--- nixpkgs/trunk/pkgs/servers/http/4store/default.nix  2010-06-30 21:51:48 UTC 
(rev 22434)
+++ nixpkgs/trunk/pkgs/servers/http/4store/default.nix  2010-07-01 05:05:47 UTC 
(rev 22435)
@@ -3,6 +3,7 @@
   glib, libxml2, pcre, avahi,
   readline, ncurses, expat,
   zlib, pkgconfig, which,
+  perl,
   db_dir ? "/var/lib/4store"
   , ...}:
 builderDefsPackage
@@ -21,7 +22,8 @@
   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/b...@#! ${a.stdenv.shell}@' -i configure
@@ -30,6 +32,8 @@
     
     sed -e 's@/var/lib/4st...@${db_dir}@g' -i src/common/params.h 
src/utilities/*
   '' ["minInit" "doUnpack"];
+
+  fixInterpreter = (a.doPatchShebangs "$out/bin");
       
   meta = {
     description = "SparQL query server (RDF storage)";

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
===================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix       2010-06-30 21:51:48 UTC 
(rev 22434)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix       2010-07-01 05:05:47 UTC 
(rev 22435)
@@ -5758,7 +5758,7 @@
 
   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;
   };
 

_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to