plasma5: Move to desktops/plasma-5

This commit is contained in:
Thomas Tuegel 2017-02-25 13:35:00 -06:00
parent 8eb4d2afbc
commit 7f84ad5f4c
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
57 changed files with 4 additions and 4 deletions

View File

@ -1,7 +1,7 @@
{ {
stdenv, lib, src, version, stdenv, lib, src, version,
automoc4, cmake, perl, pkgconfig, automoc4, cmake, perl, pkgconfig,
kdelibs, qt4, xproto kdelibs4, qt4, xproto
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -15,7 +15,7 @@ stdenv.mkDerivation {
homepage = "http://www.kde.org"; homepage = "http://www.kde.org";
}; };
inherit src; inherit src;
buildInputs = [ kdelibs qt4 xproto ]; buildInputs = [ kdelibs4 qt4 xproto ];
nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
cmakeFlags = [ cmakeFlags = [
"-DUSE_KDE4=ON" "-DUSE_KDE4=ON"

View File

@ -17,7 +17,7 @@ existing packages here and modify it as necessary.
# Updates # Updates
1. Update the URL in `./fetch.sh`. 1. Update the URL in `./fetch.sh`.
2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/kde-5/plasma` 2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/plasma-5`
from the top of the Nixpkgs tree. from the top of the Nixpkgs tree.
3. Use `nox-review wip` to check that everything builds. 3. Use `nox-review wip` to check that everything builds.
4. Commit the changes and open a pull request. 4. Commit the changes and open a pull request.

View File

@ -16815,7 +16815,7 @@ with pkgs;
pantheon-terminal = callPackage ../desktops/pantheon/apps/pantheon-terminal { }; pantheon-terminal = callPackage ../desktops/pantheon/apps/pantheon-terminal { };
}; };
plasma5 = import ../desktops/kde-5/plasma { plasma5 = import ../desktops/plasma-5 {
inherit stdenv lib libsForQt5 makeSetupHook symlinkJoin fetchurl; inherit stdenv lib libsForQt5 makeSetupHook symlinkJoin fetchurl;
inherit (gnome3) gconf; inherit (gnome3) gconf;
}; };