diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2017-08-18 15:09:51 +0000 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-08-30 01:52:17 +0200 |
| commit | 07ed5ebc8eb7721dd9414b2690b2ccfcfcd6eba9 (patch) | |
| tree | 7cd2ebb1df84caf29f80987245b014c368f30ad6 /pkgs/applications/misc/kiwix/default.nix | |
| parent | 64994b363804051e3d4b8f7916a5bc03a45b9e9a (diff) | |
| download | nixpkgs-07ed5ebc8eb7721dd9414b2690b2ccfcfcd6eba9.tar nixpkgs-07ed5ebc8eb7721dd9414b2690b2ccfcfcd6eba9.tar.gz nixpkgs-07ed5ebc8eb7721dd9414b2690b2ccfcfcd6eba9.tar.bz2 nixpkgs-07ed5ebc8eb7721dd9414b2690b2ccfcfcd6eba9.tar.lz nixpkgs-07ed5ebc8eb7721dd9414b2690b2ccfcfcd6eba9.tar.xz nixpkgs-07ed5ebc8eb7721dd9414b2690b2ccfcfcd6eba9.tar.zst nixpkgs-07ed5ebc8eb7721dd9414b2690b2ccfcfcd6eba9.zip | |
kiwix: use default gcc
overrideCC no longer needed
Diffstat (limited to 'pkgs/applications/misc/kiwix/default.nix')
| -rw-r--r-- | pkgs/applications/misc/kiwix/default.nix | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index b0590fdc38f..c5b75a0be55 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -29,10 +29,6 @@ let then { tar = xulrunner64_tar; sdk = xulrunnersdk64_tar; } else { tar = xulrunner32_tar; sdk = xulrunnersdk32_tar; }; - ctpp2_ = ctpp2.override { inherit stdenv; }; - xapian_ = xapian.override { inherit stdenv; }; - zimlib_ = zimlib.override { inherit stdenv; }; - pugixml = stdenv.mkDerivation rec { version = "1.2"; name = "pugixml-${version}"; @@ -67,8 +63,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ - zip pkgconfig python zlib xapian_ which icu libmicrohttpd - lzma zimlib_ ctpp2_ aria2 wget bc libuuid makeWrapper pugixml + zip pkgconfig python zlib xapian which icu libmicrohttpd + lzma zimlib ctpp2 aria2 wget bc libuuid makeWrapper pugixml ]; postUnpack = '' |