diff options
| author | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2019-08-30 00:22:16 -0400 |
|---|---|---|
| committer | Katharina Fey <kookie@spacekookie.de> | 2019-10-06 10:34:40 +0000 |
| commit | e1ce40f9f7b0e74f2d2f4e2b05253a7dcdb02c40 (patch) | |
| tree | b7fc19fad886d6893d9ec3e39865f3a0dbb7798d /nixpkgs/pkgs | |
| parent | 031f0356660a36953f13572394ec3ad990347526 (diff) | |
quassel: Fix use of `mkDerivation`
The `with stdenv;` would override the `mkDerivation` to be the regular
one, instead of the libsForQt5 one.
This simply removes the dangerous use of the all-encompassing `with`,
and prefers using a more precise inherit for `lib`.
See #65399
Co-authored-by: worldofpeace <worldofpeace@protonmail.ch>
Diffstat (limited to 'nixpkgs/pkgs')
| -rw-r--r-- | nixpkgs/pkgs/applications/networking/irc/quassel/default.nix | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/applications/networking/irc/quassel/default.nix b/nixpkgs/pkgs/applications/networking/irc/quassel/default.nix index 6addd66ac63..d1b950a7757 100644 --- a/nixpkgs/pkgs/applications/networking/irc/quassel/default.nix +++ b/nixpkgs/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; { |