diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-02-25 09:44:29 -0600 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-02-27 11:49:09 -0600 |
| commit | 055c0f4405cf72af40f063919a04590a893ba782 (patch) | |
| tree | 743832946b231ab4e9969afab3cce1cd3b0ea5fb /pkgs/desktops/lxqt/default.nix | |
| parent | 4e36b374d080285f3512a90b079da2b28fa800f5 (diff) | |
lxqt: Fix packaging errors
Diffstat (limited to 'pkgs/desktops/lxqt/default.nix')
| -rw-r--r-- | pkgs/desktops/lxqt/default.nix | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index 3cd8fdf221239..00e36e342fac3 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -1,13 +1,11 @@ -{ pkgs, newScope, fetchFromGitHub }: +{ pkgs, makeScope, libsForQt5, fetchFromGitHub }: let - callPackage = newScope self; - - self = rec { + packages = self: with self; { # For compiling information, see: # - https://github.com/lxde/lxqt/wiki/Building-from-source - + standardPatch = '' for file in $(find . -name CMakeLists.txt); do substituteInPlace $file \ @@ -37,7 +35,9 @@ let lxqt-about = callPackage ./core/lxqt-about { }; lxqt-admin = callPackage ./core/lxqt-admin { }; lxqt-common = callPackage ./core/lxqt-common { }; - lxqt-config = callPackage ./core/lxqt-config { }; + lxqt-config = callPackage ./core/lxqt-config { + inherit (pkgs.plasma5) libkscreen; + }; lxqt-globalkeys = callPackage ./core/lxqt-globalkeys { }; lxqt-l10n = callPackage ./core/lxqt-l10n { }; lxqt-notificationd = callPackage ./core/lxqt-notificationd { }; @@ -57,7 +57,7 @@ let ### OPTIONAL qterminal = callPackage ./optional/qterminal { }; - compton-conf = callPackage ./optional/compton-conf { }; + compton-conf = pkgs.qt5.callPackage ./optional/compton-conf { }; obconf-qt = callPackage ./optional/obconf-qt { }; lximage-qt = callPackage ./optional/lximage-qt { }; qps = callPackage ./optional/qps { }; @@ -66,14 +66,14 @@ let preRequisitePackages = [ pkgs.gvfs # virtual file systems support for PCManFM-QT - pkgs.kde5.kwindowsystem # provides some QT5 plugins needed by lxqt-panel - pkgs.kde5.libkscreen # provides plugins for screen management software + pkgs.libsForQt5.kwindowsystem # provides some QT5 plugins needed by lxqt-panel + pkgs.plasma5.libkscreen # provides plugins for screen management software pkgs.libfm pkgs.libfm-extra pkgs.lxmenu-data pkgs.menu-cache pkgs.openbox # default window manager - pkgs.qt5.qtsvg # provides QT5 plugins for svg icons + qt5.qtsvg # provides QT5 plugins for svg icons ]; corePackages = [ @@ -120,7 +120,7 @@ let qlipper ### Default icon theme - pkgs.kde5.oxygen-icons5 + qt5.oxygen-icons5 ### Screen saver pkgs.xscreensaver @@ -128,4 +128,4 @@ let }; -in self +in makeScope libsForQt5.newScope packages |