diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-08-04 10:43:07 +0000 |
| commit | 62614cbef7da005c1eda8c9400160f6bcd6546b8 (patch) | |
| tree | c2630f69080637987b68acb1ee8676d2681fe304 /pkgs/applications/networking/irc/quassel/default.nix | |
| parent | d9c82ed3044c72cecf01c6ea042489d30914577c (diff) | |
| parent | e24069138dfec3ef94f211f1da005bb5395adc11 (diff) | |
| download | nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.gz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.bz2 nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.lz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.xz nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.tar.zst nixpkgs-62614cbef7da005c1eda8c9400160f6bcd6546b8.zip | |
Merge branch 'nixpkgs-update' into master
Diffstat (limited to 'pkgs/applications/networking/irc/quassel/default.nix')
| -rw-r--r-- | pkgs/applications/networking/irc/quassel/default.nix | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 76743621fc7..b72e28929e3 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -4,7 +4,7 @@ , tag ? "-kf5" # tag added to the package name , static ? false # link statically -, stdenv, fetchFromGitHub, cmake, makeWrapper, dconf +, lib, stdenv, fetchFromGitHub, cmake, makeWrapper, dconf , mkDerivation, qtbase, qtscript , phonon, libdbusmenu, qca-qt5 @@ -20,7 +20,6 @@ }: let - inherit (stdenv) lib; buildClient = monolithic || client; buildCore = monolithic || enableDaemon; in @@ -49,13 +48,11 @@ in (if !buildClient then stdenv.mkDerivation else mkDerivation) rec { ./0001-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch ]; - enableParallelBuilding = true; - # Prevent ``undefined reference to `qt_version_tag''' in SSL check NIX_CFLAGS_COMPILE = "-DQT_NO_VERSION_TAGGING=1"; - buildInputs = - [ cmake makeWrapper qtbase ] + nativeBuildInputs = [ cmake makeWrapper ]; + buildInputs = [ qtbase ] ++ lib.optionals buildCore [qtscript qca-qt5] ++ lib.optionals buildClient [libdbusmenu phonon] ++ lib.optionals (buildClient && withKDE) [ @@ -85,7 +82,7 @@ in (if !buildClient then stdenv.mkDerivation else mkDerivation) rec { --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://quassel-irc.org/"; description = "Qt/KDE distributed IRC client suppporting a remote daemon"; longDescription = '' |