public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3174 from pSub/dconf-issue

Browse Source 
Fixed settings issue.
This commit is contained in:
lethalman 2014-07-10 11:17:10 +02:00
commit 1e806db8db
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/networking/irc/quassel/default.nix
View File

@ -5,7 +5,7 @@
, ssl ? true # enable SSL support , ssl ? true # enable SSL support
, previews ? false # enable webpage previews on hovering over URLs , previews ? false # enable webpage previews on hovering over URLs
, tag ? "" # tag added to the package name , tag ? "" # tag added to the package name
, stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon }: , stdenv, fetchurl, cmake, makeWrapper, qt4, kdelibs, automoc4, phonon, dconf }:
let let
edf = flag: feature: [("-D" + feature + (if flag then "=ON" else "=OFF"))]; edf = flag: feature: [("-D" + feature + (if flag then "=ON" else "=OFF"))];
@ -22,7 +22,7 @@ in with stdenv; mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
buildInputs = [ cmake qt4 ] buildInputs = [ cmake makeWrapper qt4 ]
++ lib.optional withKDE kdelibs ++ lib.optional withKDE kdelibs
++ lib.optional withKDE automoc4 ++ lib.optional withKDE automoc4
++ lib.optional withKDE phonon; ++ lib.optional withKDE phonon;
@ -40,6 +40,11 @@ in with stdenv; mkDerivation rec {
++ edf ssl "WITH_OPENSSL" ++ edf ssl "WITH_OPENSSL"
++ edf previews "WITH_WEBKIT" ; ++ edf previews "WITH_WEBKIT" ;
preFixup = ''
wrapProgram "$out/bin/quasselclient" \
--prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules"
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://quassel-irc.org/; homepage = http://quassel-irc.org/;
description = "Qt4/KDE4 distributed IRC client suppporting a remote daemon"; description = "Qt4/KDE4 distributed IRC client suppporting a remote daemon";

2
pkgs/top-level/all-packages.nix
View File

@ -10607,7 +10607,7 @@ let
qtcurve = callPackage ../misc/themes/qtcurve { }; qtcurve = callPackage ../misc/themes/qtcurve { };
quassel = callPackage ../applications/networking/irc/quassel { }; quassel = callPackage ../applications/networking/irc/quassel { dconf = gnome3.dconf; };
quasselDaemon = (self.quassel.override { quasselDaemon = (self.quassel.override {
monolithic = false; monolithic = false;