forked from mirrors/nixpkgs
plasma5: Move to desktops/plasma-5
This commit is contained in:
parent
8eb4d2afbc
commit
7f84ad5f4c
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
stdenv, lib, src, version,
|
||||
automoc4, cmake, perl, pkgconfig,
|
||||
kdelibs, qt4, xproto
|
||||
kdelibs4, qt4, xproto
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
@ -15,7 +15,7 @@ stdenv.mkDerivation {
|
|||
homepage = "http://www.kde.org";
|
||||
};
|
||||
inherit src;
|
||||
buildInputs = [ kdelibs qt4 xproto ];
|
||||
buildInputs = [ kdelibs4 qt4 xproto ];
|
||||
nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
|
||||
cmakeFlags = [
|
||||
"-DUSE_KDE4=ON"
|
|
@ -17,7 +17,7 @@ existing packages here and modify it as necessary.
|
|||
# Updates
|
||||
|
||||
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.
|
||||
3. Use `nox-review wip` to check that everything builds.
|
||||
4. Commit the changes and open a pull request.
|
|
@ -16815,7 +16815,7 @@ with pkgs;
|
|||
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 (gnome3) gconf;
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue