diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-08-24 08:19:05 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-08-24 08:55:37 +0200 |
commit | 2e6bf42a2207d5ecfe6e67de2def6e004a0eb1f1 (patch) | |
tree | 36de0660dc2c9f3731bd8b60ec852ca0c452efce /pkgs/applications/networking/instant-messengers/freetalk | |
parent | 84a91208a948be5eca97ea182c4256d9d6ecf171 (diff) | |
parent | 8943fb5f24b9e1aa1d577be4e214d166643269fd (diff) | |
download | nixlib-2e6bf42a2207d5ecfe6e67de2def6e004a0eb1f1.tar nixlib-2e6bf42a2207d5ecfe6e67de2def6e004a0eb1f1.tar.gz nixlib-2e6bf42a2207d5ecfe6e67de2def6e004a0eb1f1.tar.bz2 nixlib-2e6bf42a2207d5ecfe6e67de2def6e004a0eb1f1.tar.lz nixlib-2e6bf42a2207d5ecfe6e67de2def6e004a0eb1f1.tar.xz nixlib-2e6bf42a2207d5ecfe6e67de2def6e004a0eb1f1.tar.zst nixlib-2e6bf42a2207d5ecfe6e67de2def6e004a0eb1f1.zip |
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to name -> pname+version. Fortunately, almost everything was auto-resolved by kdiff3, and for now I just fixed up a couple evaluation problems, as verified by the tarball job. There might be some fallback to these conflicts, but I believe it should be minimal. Hydra nixpkgs: ?compare=1538299
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/freetalk')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/freetalk/default.nix | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/applications/networking/instant-messengers/freetalk/default.nix b/pkgs/applications/networking/instant-messengers/freetalk/default.nix index cc0bdf603944..e24ac2e18317 100644 --- a/pkgs/applications/networking/instant-messengers/freetalk/default.nix +++ b/pkgs/applications/networking/instant-messengers/freetalk/default.nix @@ -1,9 +1,7 @@ { stdenv, fetchFromGitHub , guile, pkgconfig, glib, loudmouth, gmp, libidn, readline, libtool , libunwind, ncurses, curl, jansson, texinfo -, automake, autoconf -}: - +, automake, autoconf }: stdenv.mkDerivation rec { pname = "freetalk"; version = "4.1"; @@ -19,11 +17,10 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ + nativeBuildInputs = [ pkgconfig texinfo autoconf automake ]; + buildInputs = [ guile glib loudmouth gmp libidn readline libtool - libunwind ncurses curl jansson texinfo - autoconf automake + libunwind ncurses curl jansson ]; meta = with stdenv.lib; { |