a minor update as the package seems to be incomplete
svn path=/nixpkgs/trunk/; revision=34428
This commit is contained in:
parent
9629d66928
commit
249badd76f
@ -17,12 +17,16 @@ stdenv.mkDerivation rec {
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
# we need to prevent the 'make install' to want to write to ${qt4}!
|
# we need to prevent the 'make install' to want to write to ${qt4}!
|
||||||
|
# according to thiago#qt@freenode these are used for the QML engine
|
||||||
preBuild = ''
|
preBuild = ''
|
||||||
for i in connectivity contacts feedback gallery location multimedia organizer publishsubscribe sensors serviceframework systeminfo; do
|
for i in connectivity contacts feedback gallery location multimedia organizer publishsubscribe sensors serviceframework systeminfo; do
|
||||||
substituteInPlace plugins/declarative/$i/Makefile --replace "${qt4}/lib/qt4/imports/" "$out/lib/qt4/imports/"
|
substituteInPlace plugins/declarative/$i/Makefile --replace "${qt4}/lib/qt4/imports/" "$out/lib/qt4/imports/"
|
||||||
done
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
# Features files (*.prf) are not installed on nixos
|
||||||
|
# https://bugreports.qt-project.org/browse/QTMOBILITY-1085
|
||||||
|
# - features/mobility.prf (/tmp/nix-build-9kh12nhf9cyplfwiws96gz414v6wgl67-qt-mobility-1.2.0.drv-0/qt-mobility-opensource-src-1.2.0)
|
||||||
|
|
||||||
patchPhase = ''
|
patchPhase = ''
|
||||||
# required to make the configure script work
|
# required to make the configure script work
|
||||||
substituteInPlace configure --replace "/bin/pwd" "${coreutils}/bin/pwd"
|
substituteInPlace configure --replace "/bin/pwd" "${coreutils}/bin/pwd"
|
||||||
@ -34,7 +38,7 @@ stdenv.mkDerivation rec {
|
|||||||
substituteInPlace bin/pathhelper --replace "/usr/bin/perl" "${perl}/bin/perl"
|
substituteInPlace bin/pathhelper --replace "/usr/bin/perl" "${perl}/bin/perl"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
buildInputs = [ qt4 libX11 bluez perl];
|
buildInputs = [ qt4 libX11 bluez perl ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Qt Mobility";
|
description = "Qt Mobility";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user