diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-02-25 07:15:21 -0600 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-02-27 11:49:09 -0600 |
| commit | c1ddd2353bbf3085a3b82e12edaee01d27c9e45a (patch) | |
| tree | fcee9545597b7785920a9e928a152ceaa5634168 /pkgs | |
| parent | 055c0f4405cf72af40f063919a04590a893ba782 (diff) | |
| download | nixlib-c1ddd2353bbf3085a3b82e12edaee01d27c9e45a.tar nixlib-c1ddd2353bbf3085a3b82e12edaee01d27c9e45a.tar.gz nixlib-c1ddd2353bbf3085a3b82e12edaee01d27c9e45a.tar.bz2 nixlib-c1ddd2353bbf3085a3b82e12edaee01d27c9e45a.tar.lz nixlib-c1ddd2353bbf3085a3b82e12edaee01d27c9e45a.tar.xz nixlib-c1ddd2353bbf3085a3b82e12edaee01d27c9e45a.tar.zst nixlib-c1ddd2353bbf3085a3b82e12edaee01d27c9e45a.zip | |
lumina: Fix packaging errors
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/desktops/lumina/default.nix | 18 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/desktops/lumina/default.nix b/pkgs/desktops/lumina/default.nix index f593bd144374..2c80f5157b66 100644 --- a/pkgs/desktops/lumina/default.nix +++ b/pkgs/desktops/lumina/default.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7395a60bf8b1..28bfd94d119f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; |