Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 72e80436cd6c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0daea5f19718
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 1, 2019

  1. 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>
    @samueldr @worldofpeace
    samueldr and worldofpeace committed Oct 1, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    wyattjoh Wyatt Johnson
    SSH Key Fingerprint: JvqInbZyDOQR8af6w1gV1Amt8FGpIOaAFxem3scS1ZU
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c52b5b8 View commit details

  2. Merge pull request #67746 from samueldr/pkgs/quassel/fix-wrapQtAppsHook 

    quassel: Fix use of `mkDerivation`
    @worldofpeace
    worldofpeace authored Oct 1, 2019
    Copy the full SHA
    0daea5f View commit details
Showing with 9 additions and 6 deletions.
  1. +9 −6 pkgs/applications/networking/irc/quassel/default.nix
15 changes: 9 additions & 6 deletions pkgs/applications/networking/irc/quassel/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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; {