diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2017-12-19 05:59:44 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2017-12-19 17:25:51 +0100 |
commit | 8a1475a35a7d071552cde263560d7a1eaa52e0b6 (patch) | |
tree | f1b4779a47e1b894f992e1cf3b6f8cbec800ec46 /pkgs/tools/networking/ccnet | |
parent | c747ea1b34879d4f3b2d31c763f9bd55e1e20bb1 (diff) | |
download | nixpkgs-8a1475a35a7d071552cde263560d7a1eaa52e0b6.tar nixpkgs-8a1475a35a7d071552cde263560d7a1eaa52e0b6.tar.gz nixpkgs-8a1475a35a7d071552cde263560d7a1eaa52e0b6.tar.bz2 nixpkgs-8a1475a35a7d071552cde263560d7a1eaa52e0b6.tar.lz nixpkgs-8a1475a35a7d071552cde263560d7a1eaa52e0b6.tar.xz nixpkgs-8a1475a35a7d071552cde263560d7a1eaa52e0b6.tar.zst nixpkgs-8a1475a35a7d071552cde263560d7a1eaa52e0b6.zip |
ccnet: use recent vala + clean-up
Diffstat (limited to 'pkgs/tools/networking/ccnet')
-rw-r--r-- | pkgs/tools/networking/ccnet/default.nix | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/pkgs/tools/networking/ccnet/default.nix b/pkgs/tools/networking/ccnet/default.nix index 24c86f4fa9a..036819ea76e 100644 --- a/pkgs/tools/networking/ccnet/default.nix +++ b/pkgs/tools/networking/ccnet/default.nix @@ -1,36 +1,25 @@ -{stdenv, fetchurl, which, automake, autoconf, pkgconfig, libtool, vala_0_23, python, libsearpc, libzdb, libuuid, libevent, sqlite, openssl}: +{stdenv, fetchurl, which, autoreconfHook, pkgconfig, vala, python, libsearpc, libzdb, libuuid, libevent, sqlite, openssl}: -stdenv.mkDerivation rec -{ +stdenv.mkDerivation rec { version = "6.1.0"; seafileVersion = "6.1.0"; name = "ccnet-${version}"; - src = fetchurl - { + src = fetchurl { url = "https://github.com/haiwen/ccnet/archive/v${version}.tar.gz"; sha256 = "0q4a102xlcsxlr53h4jr4w8qzkbzvm2f3nk9fsha48h6l2hw34bb"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ which automake autoconf libtool vala_0_23 python ]; + nativeBuildInputs = [ pkgconfig which autoreconfHook vala python ]; propagatedBuildInputs = [ libsearpc libzdb libuuid libevent sqlite openssl ]; - preConfigure = '' - sed -ie 's|/bin/bash|${stdenv.shell}|g' ./autogen.sh - ./autogen.sh - ''; + configureFlags = [ "--enable-server" ]; - configureFlags = "--enable-server"; - - buildPhase = "make -j1"; - - meta = - { + meta = with stdenv.lib; { homepage = https://github.com/haiwen/ccnet; description = "A framework for writing networked applications in C"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.calrama ]; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.calrama ]; }; } |