dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

lumina: Fix packaging errors

Browse Source
This commit is contained in:
Thomas Tuegel 2017-02-25 07:15:21 -06:00
parent 055c0f4405
commit c1ddd2353b
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/desktops/lumina/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, fluxbox, xscreensaver, desktop_file_utils, { stdenv, fetchFromGitHub, fluxbox, xscreensaver, desktop_file_utils, numlockx,
numlockx, xorg, qt5, kde5 xorg, qtbase, qtsvg, qtmultimedia, qtx11extras, qmakeHook, qttools, oxygen-icons5
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -14,19 +14,19 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ nativeBuildInputs = [
qt5.qmakeHook qmakeHook
qt5.qttools qttools
]; ];
buildInputs = [ buildInputs = [
xorg.libxcb xorg.libxcb
xorg.xcbutilwm xorg.xcbutilwm
xorg.xcbutilimage xorg.xcbutilimage
qt5.qtbase qtbase
qt5.qtsvg qtsvg
qt5.qtmultimedia qtmultimedia
qt5.qtx11extras qtx11extras
kde5.oxygen-icons5 oxygen-icons5
fluxbox fluxbox
xscreensaver xscreensaver
desktop_file_utils desktop_file_utils

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

@ -16779,7 +16779,7 @@ with pkgs;
); );
in recurseIntoAttrs self; in recurseIntoAttrs self;
lumina = callPackage ../desktops/lumina { }; lumina = qt5.callPackage ../desktops/lumina { };
lxqt = recurseIntoAttrs (import ../desktops/lxqt { lxqt = recurseIntoAttrs (import ../desktops/lxqt {
inherit pkgs libsForQt5 fetchFromGitHub; inherit pkgs libsForQt5 fetchFromGitHub;