diff options
author | Robbin C <robbinch33@gmail.com> | 2016-08-17 23:49:59 +0800 |
---|---|---|
committer | Robbin C <robbinch33@gmail.com> | 2016-08-18 07:55:06 +0800 |
commit | 2a84cc856b88a5ec186a3e09c3c1be3e37f6d598 (patch) | |
tree | 7876afc5c8f36fbf33403494021ca922c537b4c8 /pkgs/applications/misc/kiwix | |
parent | 4d1d37014a579979f2720f797efc544740412f2b (diff) |
kiwix: Fix broken build
Diffstat (limited to 'pkgs/applications/misc/kiwix')
-rw-r--r-- | pkgs/applications/misc/kiwix/default.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index 3de37fdbf207c..bd0118c75f443 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -1,9 +1,7 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig, zip, python -, zlib, xapian, which , icu, libmicrohttpd , lzma, zimlib -, ctpp2, aria2, wget , bc, libuuid , glibc, libX11 -, libXext, libXt, libXrender , glib, dbus, dbus_glib, gtk -, gdk_pixbuf, pango, cairo , freetype, fontconfig, alsaLib -, atk +{ stdenv, callPackage, overrideCC, fetchurl, makeWrapper, pkgconfig +, zip, python, zlib, which, icu, libmicrohttpd, lzma, ctpp2, aria2, wget, bc +, libuuid, glibc, libX11, libXext, libXt, libXrender, glib, dbus, dbus_glib +, gtk, gdk_pixbuf, pango, cairo , freetype, fontconfig, alsaLib, atk }: let @@ -31,6 +29,9 @@ let sha256 = "0sqk0vdwjq44jxbbkj1cy8qykrmafs1sickzldb2w2nshsnjshhg"; }; + xapian = callPackage ../../../development/libraries/xapian { inherit stdenv; }; + zimlib = callPackage ../../../development/libraries/zimlib { inherit stdenv; }; + in with stdenv.lib; stdenv.mkDerivation rec { @@ -97,7 +98,7 @@ stdenv.mkDerivation rec { rm $out/bin/kiwix makeWrapper $out/lib/kiwix/kiwix-launcher $out/bin/kiwix \ - --suffix LD_LIBRARY_PATH : `cat ${stdenv.cc}/nix-support/orig-cc`/lib:${makeLibraryPath [libX11 libXext libXt libXrender glib dbus dbus_glib gtk gdk_pixbuf pango cairo freetype fontconfig alsaLib atk]} \ + --suffix LD_LIBRARY_PATH : ${makeLibraryPath [stdenv.cc.cc libX11 libXext libXt libXrender glib dbus dbus_glib gtk gdk_pixbuf pango cairo freetype fontconfig alsaLib atk]} \ --suffix PATH : ${aria2}/bin ''; @@ -106,6 +107,5 @@ stdenv.mkDerivation rec { homepage = http://kiwix.org; license = licenses.gpl3; maintainers = with maintainers; [ robbinch ]; - broken = true; }; } |