public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
svn path=/nixpkgs/trunk/; revision=22435
This commit is contained in:
Michael Raskin 2010-07-01 05:05:47 +00:00
parent 853212def0
commit e312c443fc
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/servers/http/4store/default.nix
View File

@ -3,6 +3,7 @@ x@{builderDefsPackage
glib, libxml2, pcre, avahi, glib, libxml2, pcre, avahi,
readline, ncurses, expat, readline, ncurses, expat,
zlib, pkgconfig, which, zlib, pkgconfig, which,
perl,
db_dir ? "/var/lib/4store" db_dir ? "/var/lib/4store"
, ...}: , ...}:
builderDefsPackage builderDefsPackage
@ -21,7 +22,8 @@ rec {
inherit buildInputs; inherit buildInputs;
/* doConfigure should be removed if not needed */ /* doConfigure should be removed if not needed */
phaseNames = ["doFixConfigure" "doConfigure" "doMakeInstall"]; phaseNames = ["doFixConfigure" "doConfigure" "doMakeInstall"
"fixInterpreter"];
doFixConfigure = a.fullDepEntry '' doFixConfigure = a.fullDepEntry ''
sed -e 's@#! */bin/bash@#! ${a.stdenv.shell}@' -i configure 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/* sed -e 's@/var/lib/4store@${db_dir}@g' -i src/common/params.h src/utilities/*
'' ["minInit" "doUnpack"]; '' ["minInit" "doUnpack"];
fixInterpreter = (a.doPatchShebangs "$out/bin");
meta = { meta = {
description = "SparQL query server (RDF storage)"; description = "SparQL query server (RDF storage)";

2
pkgs/top-level/all-packages.nix
View File

@ -5758,7 +5758,7 @@ let
rdf4store = import ../servers/http/4store { rdf4store = import ../servers/http/4store {
inherit builderDefsPackage librdf_raptor librdf_rasqal libxml2 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; inherit (gtkLibs) glib;
}; };