diff --git a/pkgs/desktops/kde-4.5/artwork/aurorae.nix b/pkgs/desktops/kde-4.5/artwork/aurorae.nix new file mode 100644 index 000000000000..6727a0fda5a8 --- /dev/null +++ b/pkgs/desktops/kde-4.5/artwork/aurorae.nix @@ -0,0 +1,14 @@ +{ cmake, kde, automoc4, kdelibs }: + +kde.package rec { + name = "aurorae-themes-${meta.kde.version}"; + + buildInputs = [ cmake automoc4 kdelibs ]; + meta = { + kde = { + name = "aurorae"; + module = "kdeartwork"; + version = "4.5.1"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.5/artwork/color-schemes.nix b/pkgs/desktops/kde-4.5/artwork/color-schemes.nix new file mode 100644 index 000000000000..b4cf5d0f07b6 --- /dev/null +++ b/pkgs/desktops/kde-4.5/artwork/color-schemes.nix @@ -0,0 +1,15 @@ +{ cmake, kde, automoc4, kdelibs }: + +kde.package rec { + name = "kde-color-schemes-${meta.kde.version}"; + + buildInputs = [ cmake automoc4 kdelibs ]; + meta = { + description = "Additional KDE color schemes"; + kde = { + name = "ColorSchemes"; + module = "kdeartwork"; + version = "4.5.1"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.5/artwork/default.nix b/pkgs/desktops/kde-4.5/artwork/default.nix deleted file mode 100644 index 15fbb4b202a5..000000000000 --- a/pkgs/desktops/kde-4.5/artwork/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ kde, cmake, qt4, perl, xscreensaver -, kdelibs, kdebase_workspace, automoc4, strigi, eigen}: - -kde.package { - - buildInputs = [ cmake qt4 perl xscreensaver kdelibs kdebase_workspace automoc4 - strigi eigen ]; - - preConfigure = '' - cp -v ${./FindXscreensaver.cmake} cmake/modules/FindXscreensaver.cmake - ''; - - meta = { - description = "KDE artwork"; - longDescription = "Contains various artwork for KDE such as backgrounds, icons and screensavers"; - license = "LGPL"; - kde = { - name = "kdeartwork"; - version = "4.5.0"; - }; - }; -} diff --git a/pkgs/desktops/kde-4.5/artwork/desktop-themes.nix b/pkgs/desktops/kde-4.5/artwork/desktop-themes.nix new file mode 100644 index 000000000000..b762dec1f1ca --- /dev/null +++ b/pkgs/desktops/kde-4.5/artwork/desktop-themes.nix @@ -0,0 +1,15 @@ +{ cmake, kde, automoc4, kdelibs }: + +kde.package rec { + name = "kde-desktop-themes-${meta.kde.version}"; + + buildInputs = [ cmake automoc4 kdelibs ]; + meta = { + description = "Additional KDE desktop themes"; + kde = { + name = "desktopthemes"; + module = "kdeartwork"; + version = "4.5.1"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.5/artwork/emoticons.nix b/pkgs/desktops/kde-4.5/artwork/emoticons.nix new file mode 100644 index 000000000000..a9d2a2268353 --- /dev/null +++ b/pkgs/desktops/kde-4.5/artwork/emoticons.nix @@ -0,0 +1,15 @@ +{ cmake, kde, automoc4, kdelibs }: + +kde.package rec { + name = "kde-emotion-icons-${meta.kde.version}"; + + buildInputs = [ cmake automoc4 kdelibs ]; + meta = { + description = "Additional KDE emotion icons (smiles)"; + kde = { + name = "emoticons"; + module = "kdeartwork"; + version = "4.5.1"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.5/artwork/high-resolution-wallpapers.nix b/pkgs/desktops/kde-4.5/artwork/high-resolution-wallpapers.nix new file mode 100644 index 000000000000..ad6353d1b026 --- /dev/null +++ b/pkgs/desktops/kde-4.5/artwork/high-resolution-wallpapers.nix @@ -0,0 +1,15 @@ +{ cmake, kde, automoc4, kdelibs }: + +kde.package rec { + name = "kde-wallpapers-high-resolution-${meta.kde.version}"; + + buildInputs = [ cmake automoc4 kdelibs ]; + meta = { + description = "KDE wallpapers in high resolution"; + kde = { + name = "HighResolutionWallpapers"; + module = "kdeartwork"; + version = "4.5.1"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.5/artwork/kscreensaver.nix b/pkgs/desktops/kde-4.5/artwork/kscreensaver.nix new file mode 100644 index 000000000000..9fb4b24b1078 --- /dev/null +++ b/pkgs/desktops/kde-4.5/artwork/kscreensaver.nix @@ -0,0 +1,14 @@ +{ cmake, kde, automoc4, kdelibs, xscreensaver, kdebase_workspace, eigen }: + +kde.package rec { + buildInputs = [ cmake automoc4 kdelibs xscreensaver kdebase_workspace ]; + meta = { + description = "KDE screen saver and savers"; + kde = { + name = "kscreensaver"; + module = "kdeartwork"; + version = "1.0"; + release = "4.5.1"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.5/artwork/nuvola-icon-theme.nix b/pkgs/desktops/kde-4.5/artwork/nuvola-icon-theme.nix new file mode 100644 index 000000000000..34f50b90269a --- /dev/null +++ b/pkgs/desktops/kde-4.5/artwork/nuvola-icon-theme.nix @@ -0,0 +1,16 @@ +{ cmake, kde, automoc4, kdelibs }: + +kde.package rec { + name = "nuvola-icon-theme-${meta.kde.version}"; +# Sources contain primary and kdeclassic as well but they're not installed + + buildInputs = [ cmake automoc4 kdelibs ]; + meta = { + description = "KDE nuvola icon theme"; + kde = { + name = "IconThemes"; + module = "kdeartwork"; + version = "4.5.1"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.5/artwork/phase-style.nix b/pkgs/desktops/kde-4.5/artwork/phase-style.nix new file mode 100644 index 000000000000..5443d808ce98 --- /dev/null +++ b/pkgs/desktops/kde-4.5/artwork/phase-style.nix @@ -0,0 +1,15 @@ +{ cmake, kde, automoc4, kdelibs }: + +kde.package rec { + name = "kde-style-phase-${meta.kde.version}"; + + buildInputs = [ cmake automoc4 kdelibs ]; + meta = { + description = "KDE phase style. Clean classical look"; + kde = { + name = "styles"; + module = "kdeartwork"; + version = "4.5.1"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.5/artwork/sounds.nix b/pkgs/desktops/kde-4.5/artwork/sounds.nix new file mode 100644 index 000000000000..02cbf00c0277 --- /dev/null +++ b/pkgs/desktops/kde-4.5/artwork/sounds.nix @@ -0,0 +1,15 @@ +{ cmake, kde, automoc4, kdelibs }: + +kde.package rec { + name = "kde-sounds-${meta.kde.version}"; + + buildInputs = [ cmake automoc4 kdelibs ]; + meta = { + description = "New login/logout sounds"; + kde = { + name = "sounds"; + module = "kdeartwork"; + version = "4.5.1"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.5/artwork/wallpapers.nix b/pkgs/desktops/kde-4.5/artwork/wallpapers.nix new file mode 100644 index 000000000000..54f0165e1ad1 --- /dev/null +++ b/pkgs/desktops/kde-4.5/artwork/wallpapers.nix @@ -0,0 +1,15 @@ +{ cmake, kde, automoc4, kdelibs }: + +kde.package rec { + name = "kde-wallpapers-${meta.kde.version}"; + + buildInputs = [ cmake automoc4 kdelibs ]; + meta = { + description = "Additional KDE wallpapers"; + kde = { + name = "wallpapers"; + module = "kdeartwork"; + version = "4.5.1"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.5/artwork/weather-wallpapers.nix b/pkgs/desktops/kde-4.5/artwork/weather-wallpapers.nix new file mode 100644 index 000000000000..98f68a7cfdb3 --- /dev/null +++ b/pkgs/desktops/kde-4.5/artwork/weather-wallpapers.nix @@ -0,0 +1,15 @@ +{ cmake, kde, automoc4, kdelibs }: + +kde.package rec { + name = "kde-weather-wallpapers-${meta.kde.version}"; + + buildInputs = [ cmake automoc4 kdelibs ]; + meta = { + description = "Additional KDE wallpapers (weather)"; + kde = { + name = "WeatherWallpapers"; + module = "kdeartwork"; + version = "4.5.1"; + }; + }; +} diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix index 95a3cef19d9e..17cddee4e81a 100644 --- a/pkgs/desktops/kde-4.5/default.nix +++ b/pkgs/desktops/kde-4.5/default.nix @@ -60,7 +60,20 @@ }; kdeadmin = callPackage ./admin { }; - kdeartwork = callPackage ./artwork { }; + kdeartwork = { + recurseForDerivations = true; + aurorae = callPackage ./artwork/aurorae.nix { }; + colorSchemes = callPackage ./artwork/color-schemes.nix { }; + desktop_themes = callPackage ./artwork/desktop-themes.nix { }; + emoticons = callPackage ./artwork/emoticons.nix { }; + high_resolution_wallpapers = callPackage ./artwork/high-resolution-wallpapers.nix { }; + wallpapers = callPackage ./artwork/wallpapers.nix { }; + nuvola_icon_theme = callPackage ./artwork/nuvola-icon-theme.nix { }; + sounds = callPackage ./artwork/sounds.nix { }; + weather_wallpapers = callPackage ./artwork/weather-wallpapers.nix { }; + phase_style = callPackage ./artwork/phase-style.nix { }; + kscreensaver = callPackage ./artwork/kscreensaver.nix { }; + }; kdeedu = callPackage ./edu { }; kdegames = callPackage ./games { }; kdegraphics = callPackage ./graphics { }; diff --git a/pkgs/desktops/kde-4.5/kde-package/manifest.nix b/pkgs/desktops/kde-4.5/kde-package/manifest.nix index a7291b581cfc..aab661ce190e 100644 --- a/pkgs/desktops/kde-4.5/kde-package/manifest.nix +++ b/pkgs/desktops/kde-4.5/kde-package/manifest.nix @@ -124,4 +124,8 @@ builtins.listToAttrs name = "kdebindings-4.5.1.tar.bz2"; value = "1j8bf7lwb70jc0m8d2hh6c1z6vgpxbqf47w5pkq58kgan8y3zcsw"; } +{ + name = "kdeartwork-4.5.1.tar.bz2"; + value = "0fjcx6wwgzxl64s62wv2sf15plx49fck86nwzfbgbmdha1ra2gmi"; +} ]