Merge pull request #23333 from romildo/upd.qt5ct

qt5ct: 0.24 -> 0.30
This commit is contained in:
Michael Raskin 2017-04-30 19:42:31 +02:00 committed by GitHub
commit eedc0f0a78
3 changed files with 35 additions and 3 deletions

View File

@ -88,6 +88,7 @@
./programs/mtr.nix ./programs/mtr.nix
./programs/nano.nix ./programs/nano.nix
./programs/oblogout.nix ./programs/oblogout.nix
./programs/qt5ct.nix
./programs/screen.nix ./programs/screen.nix
./programs/slock.nix ./programs/slock.nix
./programs/shadow.nix ./programs/shadow.nix

View File

@ -0,0 +1,31 @@
{ config, lib, pkgs, ... }:
with lib;
{
meta.maintainers = [ maintainers.romildo ];
###### interface
options = {
programs.qt5ct = {
enable = mkOption {
default = false;
type = types.bool;
description = ''
Whether to enable the Qt5 Configuration Tool (qt5ct), a
program that allows users to configure Qt5 settings (theme,
font, icons, etc.) under desktop environments or window
manager without Qt integration.
Official home page: <link xlink:href="https://sourceforge.net/projects/qt5ct/">https://sourceforge.net/projects/qt5ct/</link>
'';
};
};
};
###### implementation
config = mkIf config.programs.qt5ct.enable {
environment.variables.QT_QPA_PLATFORMTHEME = "qt5ct";
environment.systemPackages = [ pkgs.qt5ct ];
};
}

View File

@ -2,18 +2,18 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "qt5ct-${version}"; name = "qt5ct-${version}";
version = "0.24"; version = "0.30";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/qt5ct/qt5ct-${version}.tar.bz2"; url = "mirror://sourceforge/qt5ct/qt5ct-${version}.tar.bz2";
sha256 = "0k62nd945pbgkshycijzrgdyrwj5kcswk33slaj7hr7d6r7bmb6p"; sha256 = "1k0ywd440qvf84chadjb4fnkn8dkfl56cc3a6wqg6a59drslvng6";
}; };
buildInputs = [ qtbase qtsvg ]; buildInputs = [ qtbase qtsvg ];
nativeBuildInputs = [ makeQtWrapper qmakeHook qttools ]; nativeBuildInputs = [ makeQtWrapper qmakeHook qttools ];
preConfigure = '' preConfigure = ''
qmakeFlags="$qmakeFlags PLUGINDIR=$out/lib/qt5/plugins/platformthemes/" qmakeFlags="$qmakeFlags PLUGINDIR=$out/lib/qt5/plugins"
''; '';
preFixup = '' preFixup = ''