Author: eelco
Date: Sun Jul 17 14:10:41 2011
New Revision: 27810
URL: https://svn.nixos.org/websvn/nix/?rev=27810&sc=1
Log:
* Add kde-runtime. It requires a newer Phonon than provided by Qt, so
add that as well. Maybe we should build Qt without Phonon to remove
potential interference...
Added:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/phonon.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/runtime.nix
Modified:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/support/oxygen-icons/default.nix
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix Sun Jul 17
13:27:12 2011 (r27809)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix Sun Jul 17
14:10:41 2011 (r27810)
@@ -24,8 +24,6 @@
qt4 = qt47;
- phonon = null;
-
kde = callPackage ./kde-package { inherit release; stable = false; };
### SUPPORT
@@ -40,6 +38,8 @@
libkipi = callPackage ./libkipi.nix { };
+ phonon = callPackage ./phonon.nix { };
+
#kipi_plugins = callPackage ./kipi-plugins { };
### LIBS
@@ -54,6 +54,8 @@
kde_workspace = callPackage ./workspace.nix { };
+ kde_runtime = callPackage ./runtime.nix { };
+
# Backwards compatibility.
kdebase_workspace = kde_workspace;
Added: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/phonon.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/phonon.nix Sun Jul 17
14:10:41 2011 (r27810)
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, cmake, automoc4, qt4 }:
+
+stdenv.mkDerivation rec {
+ name = "phonon-4.5.0";
+
+ src = fetchurl {
+ url = "mirror://kde/stable/phonon/4.5.0/src/${name}.tar.bz2";
+ sha256 = "1p2jhxx3ij9xqxvzdz6fm14b83iag9sk940clgj5jnnw00x93s36";
+ };
+
+ buildInputs = [ cmake automoc4 qt4 ];
+
+ preConfigure =
+ ''
+ substituteInPlace CMakeLists.txt \
+ --replace 'PHONON_MKSPECS_DIR}' 'CMAKE_INSTALL_PREFIX}/mkspecs'
+ substituteInPlace designer/CMakeLists.txt \
+ --replace 'QT_PLUGINS_DIR}' 'CMAKE_INSTALL_PREFIX}/lib/qt4/plugins'
+ '';
+
+ meta = {
+ homepage = http://phonon.kde.org/;
+ description = "Multimedia API for Qt";
+ license = "LGPLv2";
+ };
+}
Added: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/runtime.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/runtime.nix Sun Jul 17
14:10:41 2011 (r27810)
@@ -0,0 +1,22 @@
+{ automoc4, cmake, kde, kdelibs, qt4, strigi, soprano,
shared_desktop_ontologies
+, bzip2, xz, shared_mime_info, libssh, exiv2, attica, phonon, libcanberra
+}:
+
+kde.package {
+
+ buildInputs =
+ [ phonon cmake kdelibs qt4 automoc4 strigi soprano
+ shared_desktop_ontologies bzip2 xz shared_mime_info libssh
+ exiv2 attica
+ (libcanberra.override { gtk = null; })
+ ];
+
+ # Work around undefined reference to ‘openpty’ in kioslave/fish/fish.cpp.
+ NIX_LDFLAGS = "-lutil";
+
+ meta = {
+ license = "LGPL";
+ kde.name = "kde-runtime";
+ };
+
+}
Modified:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/support/oxygen-icons/default.nix
==============================================================================
---
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/support/oxygen-icons/default.nix
Sun Jul 17 13:27:12 2011 (r27809)
+++
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/support/oxygen-icons/default.nix
Sun Jul 17 14:10:41 2011 (r27810)
@@ -1,14 +1,15 @@
-{kde, cmake}:
+{ kde, cmake }:
kde.package {
outputHashAlgo = "sha256";
outputHashMode = "recursive";
- outputHash =
"4c2881683f8d66114ac79a9573498e627146aa647574efb9b8f89f837e1d7b06";
+ outputHash =
"4736af7eef8c0defa8f5ae997ac85e0a19c4d1af9a9e963b2434317c5408ab86";
buildInputs = [ cmake ];
+
meta = {
description = "KDE Oxygen theme icons";
- longDescription = "Contains icons for the KDE Oxygen theme, which is the
default icon theme since KDE 4.3";
+ longDescription = "Icons for KDE's default theme";
license = "GPL";
kde.name = "oxygen-icons";
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
