diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2017-04-30 19:42:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-30 19:42:31 +0200 |
| commit | eedc0f0a78f807f9dafadf14b5ed944e0239bca2 (patch) | |
| tree | a024a4b7b60bfdf70836d12b4a7a7f6ce716525d | |
| parent | 929ae39dbe3bc179fd73f6d2474d9de3b24d0f10 (diff) | |
| parent | 2630e7384fa623337ca35a541eae371152d21768 (diff) | |
| download | nixlib-eedc0f0a78f807f9dafadf14b5ed944e0239bca2.tar nixlib-eedc0f0a78f807f9dafadf14b5ed944e0239bca2.tar.gz nixlib-eedc0f0a78f807f9dafadf14b5ed944e0239bca2.tar.bz2 nixlib-eedc0f0a78f807f9dafadf14b5ed944e0239bca2.tar.lz nixlib-eedc0f0a78f807f9dafadf14b5ed944e0239bca2.tar.xz nixlib-eedc0f0a78f807f9dafadf14b5ed944e0239bca2.tar.zst nixlib-eedc0f0a78f807f9dafadf14b5ed944e0239bca2.zip | |
Merge pull request #23333 from romildo/upd.qt5ct
qt5ct: 0.24 -> 0.30
| -rw-r--r-- | nixos/modules/module-list.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/programs/qt5ct.nix | 31 | ||||
| -rw-r--r-- | pkgs/tools/misc/qt5ct/default.nix | 6 |
3 files changed, 35 insertions, 3 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 99bc0da2b3a7..5c6668fbdc6a 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -88,6 +88,7 @@ ./programs/mtr.nix ./programs/nano.nix ./programs/oblogout.nix + ./programs/qt5ct.nix ./programs/screen.nix ./programs/slock.nix ./programs/shadow.nix diff --git a/nixos/modules/programs/qt5ct.nix b/nixos/modules/programs/qt5ct.nix new file mode 100644 index 000000000000..550634e65be9 --- /dev/null +++ b/nixos/modules/programs/qt5ct.nix @@ -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 ]; + }; +} diff --git a/pkgs/tools/misc/qt5ct/default.nix b/pkgs/tools/misc/qt5ct/default.nix index dd94e379eed9..4377b386d85c 100644 --- a/pkgs/tools/misc/qt5ct/default.nix +++ b/pkgs/tools/misc/qt5ct/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation rec { name = "qt5ct-${version}"; - version = "0.24"; + version = "0.30"; src = fetchurl { url = "mirror://sourceforge/qt5ct/qt5ct-${version}.tar.bz2"; - sha256 = "0k62nd945pbgkshycijzrgdyrwj5kcswk33slaj7hr7d6r7bmb6p"; + sha256 = "1k0ywd440qvf84chadjb4fnkn8dkfl56cc3a6wqg6a59drslvng6"; }; buildInputs = [ qtbase qtsvg ]; nativeBuildInputs = [ makeQtWrapper qmakeHook qttools ]; preConfigure = '' - qmakeFlags="$qmakeFlags PLUGINDIR=$out/lib/qt5/plugins/platformthemes/" + qmakeFlags="$qmakeFlags PLUGINDIR=$out/lib/qt5/plugins" ''; preFixup = '' |