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

Merge pull request #17799 from robbinch/pkg-kiwix

Browse Source 
kiwix: Fix broken build
This commit is contained in:
Joachim F 2016-08-18 17:13:21 +02:00 committed by GitHub
commit 409b53cba8
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,9 +1,7 @@
{ stdenv, fetchurl, makeWrapper, pkgconfig, zip, python { stdenv, callPackage, overrideCC, fetchurl, makeWrapper, pkgconfig
, zlib, xapian, which , icu, libmicrohttpd , lzma, zimlib , zip, python, zlib, which, icu, libmicrohttpd, lzma, ctpp2, aria2, wget, bc
, ctpp2, aria2, wget , bc, libuuid , glibc, libX11 , libuuid, glibc, libX11, libXext, libXt, libXrender, glib, dbus, dbus_glib
, libXext, libXt, libXrender , glib, dbus, dbus_glib, gtk , gtk, gdk_pixbuf, pango, cairo , freetype, fontconfig, alsaLib, atk
, gdk_pixbuf, pango, cairo , freetype, fontconfig, alsaLib
, atk
}: }:
let let
@ -31,6 +29,9 @@ let
sha256 = "0sqk0vdwjq44jxbbkj1cy8qykrmafs1sickzldb2w2nshsnjshhg"; sha256 = "0sqk0vdwjq44jxbbkj1cy8qykrmafs1sickzldb2w2nshsnjshhg";
}; };
xapian = callPackage ../../../development/libraries/xapian { inherit stdenv; };
zimlib = callPackage ../../../development/libraries/zimlib { inherit stdenv; };
in in
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -97,7 +98,7 @@ stdenv.mkDerivation rec {
rm $out/bin/kiwix rm $out/bin/kiwix
makeWrapper $out/lib/kiwix/kiwix-launcher $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 --suffix PATH : ${aria2}/bin
''; '';
@ -106,6 +107,5 @@ stdenv.mkDerivation rec {
homepage = http://kiwix.org; homepage = http://kiwix.org;
license = licenses.gpl3; license = licenses.gpl3;
maintainers = with maintainers; [ robbinch ]; maintainers = with maintainers; [ robbinch ];
broken = true;
}; };
} }

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

@ -13657,7 +13657,9 @@ in
ffmpeg = ffmpeg_2; ffmpeg = ffmpeg_2;
}; };
kiwix = callPackage ../applications/misc/kiwix { }; kiwix = callPackage ../applications/misc/kiwix {
stdenv = overrideCC stdenv gcc49;
};
koji = callPackage ../tools/package-management/koji { }; koji = callPackage ../tools/package-management/koji { };