diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-10-03 01:47:08 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-10-03 01:47:08 +0200 |
| commit | b3fcd9375d89060979ce67d13c6714ebc3e1c002 (patch) | |
| tree | e5120c8684e77b7b579c5fd348915cecdca66c57 /pkgs/applications/networking/irc | |
| parent | 3a4658ea04d66e849aa29c1f747ab8becc14949c (diff) | |
| parent | 3dc58eda52ef935313cd0418264abd1d30d6b4d3 (diff) | |
| download | nixlib-b3fcd9375d89060979ce67d13c6714ebc3e1c002.tar nixlib-b3fcd9375d89060979ce67d13c6714ebc3e1c002.tar.gz nixlib-b3fcd9375d89060979ce67d13c6714ebc3e1c002.tar.bz2 nixlib-b3fcd9375d89060979ce67d13c6714ebc3e1c002.tar.lz nixlib-b3fcd9375d89060979ce67d13c6714ebc3e1c002.tar.xz nixlib-b3fcd9375d89060979ce67d13c6714ebc3e1c002.tar.zst nixlib-b3fcd9375d89060979ce67d13c6714ebc3e1c002.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/applications/networking/irc')
| -rw-r--r-- | pkgs/applications/networking/irc/quassel/default.nix | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 6addd66ac634..d1b950a7757c 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -5,7 +5,7 @@ , static ? false # link statically , stdenv, fetchFromGitHub, cmake, makeWrapper, dconf -, qtbase, qtscript +, mkDerivation, qtbase, qtscript , phonon, libdbusmenu, qca-qt5 , withKDE ? true # enable KDE integration @@ -20,6 +20,7 @@ }: let + inherit (stdenv) lib; buildClient = monolithic || client; buildCore = monolithic || enableDaemon; in @@ -31,7 +32,7 @@ assert !buildClient -> !withKDE; # KDE is used by the client only let edf = flag: feature: [("-D" + feature + (if flag then "=ON" else "=OFF"))]; -in with stdenv; mkDerivation rec { +in (if !buildClient then stdenv.mkDerivation else mkDerivation) rec { name = "quassel${tag}-${version}"; version = "0.13.1"; @@ -67,13 +68,15 @@ in with stdenv; mkDerivation rec { ++ edf client "WANT_QTCLIENT" ++ edf withKDE "WITH_KDE"; - preFixup = + dontWrapQtApps = true; + + postFixup = lib.optionalString enableDaemon '' - wrapProgram "$out/bin/quasselcore" --suffix PATH : "${qtbase.bin}/bin" + wrapProgram "$out/bin/quasselcore" --suffix PATH : "${qtbase.bin}/bin" '' + lib.optionalString buildClient '' - wrapProgram "$out/bin/quassel${lib.optionalString client "client"}" \ - --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" + wrapQtApp "$out/bin/quassel${lib.optionalString client "client"}" \ + --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" ''; meta = with stdenv.lib; { |