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

kiwix: fix eval and build

Browse Source
This commit is contained in:
Robin Gloster 2017-03-07 14:03:08 +01:00
parent 4c1be22272
commit 09d7f7dfbd
No known key found for this signature in database
GPG Key ID: 5E4C836C632C2882
2 changed files with 9 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pkgs/applications/misc/kiwix/default.nix
View File

@ -1,7 +1,8 @@
{ stdenv, callPackage, overrideCC, fetchurl, makeWrapper, pkgconfig { stdenv, callPackage, fetchurl, makeWrapper, pkgconfig
, zip, python, zlib, which, icu, libmicrohttpd, lzma, aria2, wget, bc , zip, python, zlib, which, icu, libmicrohttpd, lzma, aria2, wget, bc
, libuuid, glibc, libX11, libXext, libXt, libXrender, glib, dbus, dbus_glib , libuuid, glibc, libX11, libXext, libXt, libXrender, glib, dbus, dbus_glib
, gtk2, gdk_pixbuf, pango, cairo, freetype, fontconfig, alsaLib, atk, cmake , gtk2, gdk_pixbuf, pango, cairo, freetype, fontconfig, alsaLib, atk, cmake
, xapian, ctpp2, zimlib
}: }:
with stdenv.lib; with stdenv.lib;
@ -28,10 +29,9 @@ let
then { tar = xulrunner64_tar; sdk = xulrunnersdk64_tar; } then { tar = xulrunner64_tar; sdk = xulrunnersdk64_tar; }
else { tar = xulrunner32_tar; sdk = xulrunnersdk32_tar; }; else { tar = xulrunner32_tar; sdk = xulrunnersdk32_tar; };
ctpp2 = callPackage ../../../development/libraries/ctpp2 { inherit stdenv; }; ctpp2_ = ctpp2.override { inherit stdenv; };
xapian = callPackage ../../../development/libraries/xapian { inherit stdenv; }; xapian_ = xapian.override { inherit stdenv; };
zimlib = callPackage ../../../development/libraries/zimlib { inherit stdenv; }; zimlib_ = zimlib.override { inherit stdenv; };
pugixml = stdenv.mkDerivation rec { pugixml = stdenv.mkDerivation rec {
version = "1.2"; version = "1.2";
@ -53,9 +53,6 @@ let
# and the build scripts are in there :'( # and the build scripts are in there :'(
cd scripts cd scripts
''; '';
NIX_CFLAGS_COMPILE = "-fPIC";
}; };
in in
@ -70,23 +67,8 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
zip zip pkgconfig python zlib xapian_ which icu libmicrohttpd
pkgconfig lzma zimlib_ ctpp2_ aria2 wget bc libuuid makeWrapper pugixml
python
zlib
xapian
which
icu
libmicrohttpd
lzma
zimlib
ctpp2
aria2
wget
bc
libuuid
makeWrapper
pugixml
]; ];
postUnpack = '' postUnpack = ''
@ -107,8 +89,7 @@ stdenv.mkDerivation rec {
"--disable-staticbins" "--disable-staticbins"
]; ];
installPhase = '' postInstall = ''
make install
cp -r src/dependencies/xulrunner $out/lib/kiwix cp -r src/dependencies/xulrunner $out/lib/kiwix
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/lib/kiwix/xulrunner/xulrunner patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/lib/kiwix/xulrunner/xulrunner

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

@ -10042,7 +10042,7 @@ with pkgs;
x265 = callPackage ../development/libraries/x265 { }; x265 = callPackage ../development/libraries/x265 { };
inherit (callPackage ../development/libraries/xapian { }) inherit (callPackages ../development/libraries/xapian { })
xapian_1_2_22 xapian_1_4_0; xapian_1_2_22 xapian_1_4_0;
xapian = xapian_1_4_0; xapian = xapian_1_4_0;