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

lxqt: fix small issues in nix expressions

Browse Source
This commit is contained in:
José Romildo Malaquias 2016-10-03 19:57:00 -03:00
parent f3e8bfa823
commit 49ed3ab705
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/services/x11/desktop-managers/lxqt.nix
View File

@ -31,6 +31,7 @@ in
}; };
environment.systemPackages = [ environment.systemPackages = [
pkgs.kde5.kwindowsystem # provides some QT5 plugins needed by lxqt-panel
pkgs.kde5.oxygen-icons5 # default icon theme pkgs.kde5.oxygen-icons5 # default icon theme
pkgs.libfm pkgs.libfm
pkgs.libfm-extra pkgs.libfm-extra

4
pkgs/desktops/lxqt/core/lxqt-panel/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, xorg, { stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, xorg,
libstatgrab, lm_sensors, libpulseaudio, alsaLib, menu-cache, lxmenu-data }: libstatgrab, lm_sensors, libpulseaudio, alsaLib, menu-cache,
lxmenu-data }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -23,6 +24,7 @@ stdenv.mkDerivation rec {
qt5.libdbusmenu qt5.libdbusmenu
kde5.kwindowsystem kde5.kwindowsystem
kde5.solid kde5.solid
kde5.kguiaddons
lxqt.liblxqt lxqt.liblxqt
lxqt.libqtxdg lxqt.libqtxdg
lxqt.lxqt-globalkeys lxqt.lxqt-globalkeys

8
pkgs/desktops/lxqt/default.nix
View File

@ -6,8 +6,8 @@ let
self = rec { self = rec {
# For compiling information, see: # For compiling information, see:
# - https://github.com/lxde/lxqt/wiki/Building-from-source # - https://github.com/lxde/lxqt/wiki/Building-from-source
standardPatch = '' standardPatch = ''
for file in $(find . -name CMakeLists.txt); do for file in $(find . -name CMakeLists.txt); do
substituteInPlace $file \ substituteInPlace $file \
@ -21,7 +21,7 @@ let
echo $file echo $file
grep --color=always DESTINATION $file || true grep --color=always DESTINATION $file || true
grep --color=always share/lxqt/translations $file || true grep --color=always share/lxqt/translations $file || true
grep --color=always platformthemes $file || true grep --color=always platform $file || true
done done
echo -------------------------------------------------------- echo --------------------------------------------------------
''; '';
@ -56,5 +56,7 @@ let
### OPTIONAL ### OPTIONAL
qterminal = callPackage ./optional/qterminal { }; qterminal = callPackage ./optional/qterminal { };
};
in self in self