mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 06:45:16 +01:00
* Update pycups, PyQt and SIP.
svn path=/nixpkgs/branches/kde-4.7/; revision=27889
This commit is contained in:
parent
aa6f8184b5
commit
8b4730bdbd
3 changed files with 27 additions and 30 deletions
|
@ -1,17 +1,18 @@
|
|||
{stdenv, fetchurl, python, cups}:
|
||||
{ stdenv, fetchurl, python, cups }:
|
||||
|
||||
let version = "1.9.57"; in
|
||||
|
||||
let
|
||||
version = "1.9.49";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "pycups-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://cyberelk.net/tim/data/pycups/pycups-${version}.tar.bz2";
|
||||
sha256 = "1gpp28sknjw5z4mzhaifc6hkfrlbm2y6w870q47ia8amnm05d3pk";
|
||||
sha256 = "12m3lh4nmfp6yn6sqlskl9gb1mfiwx42m8dnms6j6xc2nimn5k14";
|
||||
};
|
||||
buildPhase = "";
|
||||
|
||||
installPhase = ''
|
||||
CFLAGS=-DVERSION=\\\"${version}\\\" python ./setup.py install --prefix $out
|
||||
'';
|
||||
|
||||
buildInputs = [ python cups ];
|
||||
}
|
||||
|
|
|
@ -1,39 +1,35 @@
|
|||
{stdenv, fetchurl, python, sip, qt4, pythonDBus, pkgconfig, lndir, makeWrapper }:
|
||||
{ stdenv, fetchurl, python, sip, qt4, pythonDBus, pkgconfig, lndir, makeWrapper }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "PyQt-x11-gpl-4.8.1";
|
||||
name = "PyQt-x11-gpl-4.8.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://nixos.org/tarballs/${name}.tar.gz";
|
||||
sha256 = "0w7k1jz7wcfwqq77hiwgds5s6py7kkg1rszd6c94bk9dr06vishz";
|
||||
url = "http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/${name}.tar.gz";
|
||||
sha256 = "161y1c39zr9dyl2nkllxw5711sl1dxmb6lbp4a9nvbag1g63xypw";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
ensureDir $out
|
||||
lndir ${pythonDBus} $out
|
||||
export PYTHONPATH=$PYTHONPATH:$out/lib/${python.libPrefix}/site-packages
|
||||
configurePhase = ''
|
||||
substituteInPlace configure.py \
|
||||
--replace 'install_dir=pydbusmoddir' "install_dir='$out/lib/${python.libPrefix}/site-packages/dbus/mainloop'"
|
||||
|
||||
configureFlagsArray=( \
|
||||
--confirm-license --bindir $out/bin \
|
||||
--destdir $out/lib/${python.libPrefix}/site-packages \
|
||||
--plugin-destdir $out/lib/qt4/plugins --sipdir $out/share/sip \
|
||||
--dbus=$out/include/dbus-1.0 --verbose)
|
||||
'';
|
||||
--dbus=${pythonDBus}/include/dbus-1.0 --verbose)
|
||||
|
||||
configureScript="./configure.py";
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
python configure.py $configureFlags "''${configureFlagsArray[@]}"
|
||||
runHook postConfigure'';
|
||||
|
||||
propagatedBuildInputs = [ python sip qt4 ]
|
||||
++ pythonDBus.propagatedBuildNativeInputs;
|
||||
buildInputs = [ pkgconfig makeWrapper lndir ];
|
||||
'';
|
||||
|
||||
buildInputs = [ python pkgconfig makeWrapper sip qt4 pythonDBus ];
|
||||
|
||||
postInstall = ''
|
||||
for i in $out/bin/*; do
|
||||
wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH"
|
||||
done'';
|
||||
wrapProgram $i --prefix PYTHONPATH : $out/lib/${python.libPrefix}/site-packages:$PYTHONPATH
|
||||
done
|
||||
''; # */
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
description = "Python bindings for Qt";
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv, fetchurl, python }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "sip-4.11.2";
|
||||
name = "sip-4.12.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://nixos.org/tarballs/${name}.tar.gz";
|
||||
sha256 = "0g1pj203m491rhy111ayr4k4lsbcqd8sa1np503xv94a90b05l6f";
|
||||
url = "http://www.riverbankcomputing.co.uk/static/Downloads/sip4/${name}.tar.gz";
|
||||
sha256 = "0zmpq10f58hl0zy26p5s8flsbp6g0dsq8hvi4mlmqp60lhichlml";
|
||||
};
|
||||
|
||||
configurePhase = "python ./configure.py -d $out/lib/${python.libPrefix}/site-packages -b $out/bin -e $out/include";
|
||||
|
|
Loading…
Reference in a new issue