Author: eelco
Date: Fri Jul 22 01:28:09 2011
New Revision: 27898
URL: https://svn.nixos.org/websvn/nix/?rev=27898&sc=1
Log:
* Update kdeadmin and kdegames.
Added:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/admin.nix
- copied, changed from r27866,
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/admin/default.nix
Deleted:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/admin/
Modified:
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/games.nix
nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/pykde4.nix
nixpkgs/branches/kde-4.7/pkgs/development/python-modules/pyqt/default.nix
nixpkgs/branches/kde-4.7/pkgs/tools/misc/system-config-printer/default.nix
Copied and modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/admin.nix
(from r27866, nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/admin/default.nix)
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/admin/default.nix Thu Jul
21 07:42:05 2011 (r27866, copy source)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/admin.nix Fri Jul 22
01:28:09 2011 (r27898)
@@ -1,20 +1,47 @@
-{ kde, cmake, qt4, pkgconfig, perl, python
-, sip, pyqt4, pycups, rhpl, system_config_printer
-, kdelibs, kdepimlibs, kdebindings, automoc4}:
-
-kde.package {
-
- builder = ./builder.sh;
-
- inherit system_config_printer;
-
- # TODO: split, check which packages work on nixos
-
- PYTHONPATH = "${pycups}/lib/python${python.majorVersion}/site-packages";
-
- buildInputs = [ cmake qt4 pkgconfig perl python sip pyqt4 pycups rhpl
system_config_printer
- kdelibs kdepimlibs kdebindings automoc4 ];
-
+{ kde, cmake, qt4, pkgconfig, perl, pythonPackages
+, sip, pycups, pygobject, system_config_printer
+, kdelibs, automoc4, phonon, kdepimlibs, pykde4
+, cups, nettools } @ args:
+
+let
+
+ system_config_printer = args.system_config_printer.override { withGUI =
false; };
+
+in
+
+kde.package rec {
+
+ buildInputs =
+ [ cmake kdelibs qt4 automoc4 phonon kdepimlibs
+ pythonPackages.python
+ pycups pykde4 sip pygobject system_config_printer
+ ];
+
+ passthru = { inherit system_config_printer; };
+
+ preConfigure =
+ ''
+ for i in
system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py
system-config-printer-kde/system-config-printer-kde.py; do
+ substituteInPlace $i \
+ --replace /usr/share/system-config-printer
${system_config_printer}/share/system-config-printer \
+ --replace /usr/bin/cupstestppd ${cups}/bin/cupstestppd \
+ --replace /bin/hostname ${nettools}/bin/hostname
+ done
+ '';
+
+ postInstall =
+ ''
+ # Bake the required Python path into the printer configuration program.
+ res=
+ for i in $(IFS=:; echo $PYTHONPATH); do res="$res''${res:+,} '$i'"; done
+
+ sed -i
$out/share/apps/system-config-printer-kde/system-config-printer-kde.py \
+ -e "1 a import sys\nsys.path = [$res] + sys.path"
+
+ mkdir -p $out/nix-support
+ echo ${pykde4} > $out/nix-support/propagated-user-env-packages
+ '';
+
meta = {
description = "KDE Administration Utilities";
license = "GPL";
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 Thu Jul 21
22:18:52 2011 (r27897)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/default.nix Fri Jul 22
01:28:09 2011 (r27898)
@@ -83,6 +83,8 @@
kde_wallpapers = callPackage ./wallpapers.nix { };
+ kdeadmin = callPackage ./admin.nix { };
+
kdegames = callPackage ./games.nix { };
/*
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/games.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/games.nix Thu Jul 21
22:18:52 2011 (r27897)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/games.nix Fri Jul 22
01:28:09 2011 (r27898)
@@ -13,10 +13,7 @@
# TODO: ggz
- postInstall =
- ''
- wrapPythonPrograms
- '';
+ postInstall = "wrapPythonPrograms";
meta = {
description = "KDE Games";
Modified: nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/pykde4.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/pykde4.nix Thu Jul 21
22:18:52 2011 (r27897)
+++ nixpkgs/branches/kde-4.7/pkgs/desktops/kde-4.7/pykde4.nix Fri Jul 22
01:28:09 2011 (r27898)
@@ -1,11 +1,11 @@
{ kde, cmake, qt4, automoc4, kdelibs, phonon, python, sip, pyqt4
-, soprano, kdepimlibs, shared_desktop_ontologies, boost }:
+, soprano, kdepimlibs, shared_desktop_ontologies, boost, lndir }:
kde.package {
buildInputs =
[ cmake kdelibs qt4 automoc4 phonon python sip pyqt4 soprano
- kdepimlibs shared_desktop_ontologies boost
+ kdepimlibs shared_desktop_ontologies boost lndir
];
NIX_CFLAGS_COMPILE = "-I${phonon}/include/phonon";
@@ -14,6 +14,12 @@
''
substituteInPlace CMakeLists.txt \
--replace '{SIP_DEFAULT_SIP_DIR}' '{CMAKE_INSTALL_PREFIX}/share/sip'
+
+ # Symlink PyQt into PyKDE. This is necessary because PyQt looks
+ # in its PyQt4/uic/widget-plugins directory for plugins, and KDE
+ # needs to install a plugin.
+ mkdir -p $out/lib/python2.7
+ lndir ${pyqt4}/lib/python2.7 $out/lib/python2.7
'';
meta = {
Modified:
nixpkgs/branches/kde-4.7/pkgs/development/python-modules/pyqt/default.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/development/python-modules/pyqt/default.nix
Thu Jul 21 22:18:52 2011 (r27897)
+++ nixpkgs/branches/kde-4.7/pkgs/development/python-modules/pyqt/default.nix
Fri Jul 22 01:28:09 2011 (r27898)
@@ -9,6 +9,11 @@
};
configurePhase = ''
+ mkdir -p $out
+ lndir ${pythonDBus} $out
+
+ export PYTHONPATH=$PYTHONPATH:$out/lib/${python.libPrefix}/site-packages
+
substituteInPlace configure.py \
--replace 'install_dir=pydbusmoddir'
"install_dir='$out/lib/${python.libPrefix}/site-packages/dbus/mainloop'"
@@ -16,18 +21,18 @@
--confirm-license --bindir $out/bin \
--destdir $out/lib/${python.libPrefix}/site-packages \
--plugin-destdir $out/lib/qt4/plugins --sipdir $out/share/sip \
- --dbus=${pythonDBus}/include/dbus-1.0 --verbose)
+ --dbus=$out/include/dbus-1.0 --verbose)
python configure.py $configureFlags "''${configureFlagsArray[@]}"
'';
- buildInputs = [ python pkgconfig makeWrapper qt4 ];
+ buildInputs = [ python pkgconfig makeWrapper qt4 lndir ];
- propagatedBuildInputs = [ sip pythonDBus ];
+ propagatedBuildInputs = [ sip ];
postInstall = ''
for i in $out/bin/*; do
- wrapProgram $i --prefix PYTHONPATH :
$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH
+ wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH"
done
''; # */
Modified:
nixpkgs/branches/kde-4.7/pkgs/tools/misc/system-config-printer/default.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/tools/misc/system-config-printer/default.nix
Thu Jul 21 22:18:52 2011 (r27897)
+++ nixpkgs/branches/kde-4.7/pkgs/tools/misc/system-config-printer/default.nix
Fri Jul 22 01:28:09 2011 (r27898)
@@ -2,6 +2,7 @@
, makeWrapper, pygobject, pygtk, docbook_xml_dtd_412, docbook_xsl
, pythonDBus, libxml2, desktop_file_utils, libusb, cups, pycups
, xz, pythonPackages
+, withGUI ? true
}:
stdenv.mkDerivation rec {
@@ -18,7 +19,9 @@
pythonPackages.python pythonPackages.wrapPython
];
- pythonPath = [ pythonDBus pycups pygtk pythonPackages.notify ];
+ pythonPath =
+ [ pythonDBus pycups pygobject ]
+ ++ stdenv.lib.optionals withGUI [ pygtk pythonPackages.notify ];
configureFlags = "--with-udev-rules";
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
