alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases 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,
numlockx, xorg, qt5, kde5
{ stdenv, fetchFromGitHub, fluxbox, xscreensaver, desktop_file_utils, numlockx,
xorg, qtbase, qtsvg, qtmultimedia, qtx11extras, qmakeHook, qttools, oxygen-icons5
}:
stdenv.mkDerivation rec {
@ -14,19 +14,19 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
qt5.qmakeHook
qt5.qttools
qmakeHook
qttools
];
buildInputs = [
xorg.libxcb
xorg.xcbutilwm
xorg.xcbutilimage
qt5.qtbase
qt5.qtsvg
qt5.qtmultimedia
qt5.qtx11extras
kde5.oxygen-icons5
qtbase
qtsvg
qtmultimedia
qtx11extras
oxygen-icons5
fluxbox
xscreensaver
desktop_file_utils

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

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