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

kiwix: use default gcc 

overrideCC no longer needed
This commit is contained in:
Jan Malakhovski 2017-08-18 15:09:51 +00:00 committed by Franz Pletz
parent 64994b3638
commit 07ed5ebc8e
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,10 +29,6 @@ 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_ = ctpp2.override { inherit stdenv; };
xapian_ = xapian.override { inherit stdenv; };
zimlib_ = zimlib.override { inherit stdenv; };
pugixml = stdenv.mkDerivation rec { pugixml = stdenv.mkDerivation rec {
version = "1.2"; version = "1.2";
name = "pugixml-${version}"; name = "pugixml-${version}";
@ -67,8 +63,8 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
zip pkgconfig python zlib xapian_ which icu libmicrohttpd zip pkgconfig python zlib xapian which icu libmicrohttpd
lzma zimlib_ ctpp2_ aria2 wget bc libuuid makeWrapper pugixml lzma zimlib ctpp2 aria2 wget bc libuuid makeWrapper pugixml
]; ];
postUnpack = '' postUnpack = ''

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

@ -14957,9 +14957,7 @@ with pkgs;
kipi-plugins = libsForQt5.callPackage ../applications/graphics/kipi-plugins { }; kipi-plugins = libsForQt5.callPackage ../applications/graphics/kipi-plugins { };
kiwix = callPackage ../applications/misc/kiwix { kiwix = callPackage ../applications/misc/kiwix { };
stdenv = overrideCC stdenv gcc49;
};
kmplayer = kde4.callPackage ../applications/video/kmplayer { }; kmplayer = kde4.callPackage ../applications/video/kmplayer { };