public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qt-mobility: fix package

Browse Source 
Fixed QtMobility's build script so that it builds correctly.

The package is now downloaded from a GitHub mirror repo instead of
Nokia's download site, which is no longer available.

Also added the package to all-packages.nix so that it can actually be
used (who knows why it wasn't in there).
This commit is contained in:
Forkk 2015-04-14 13:31:39 -05:00
parent 4e51a466bd
commit c5457ebd9b
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/qt-mobility/default.nix
View File

@ -1,13 +1,14 @@
{ stdenv, fetchurl, qt4, libX11, coreutils, bluez, perl }: { stdenv, fetchFromGitHub, qt4, libX11, coreutils, bluez, perl }:
# possible additional dependencies: pulseaudio udev networkmanager immerson qmf # possible additional dependencies: pulseaudio udev networkmanager immerson qmf
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.2.0"; version = "1.2.0";
name = "qt-mobility-${version}"; name = "qt-mobility-${version}";
download = "qt-mobility-opensource-src-${version}"; src = fetchFromGitHub {
src = fetchurl { owner = "qtproject";
url = "http://get.qt.nokia.com/qt/add-ons/${download}.tar.gz"; repo = "qt-mobility";
sha256 = "ee3c88975e04139ac9589f76d4be646d44fcbc4c8c1cf2db621abc154cf0ba44"; rev = "v${version}";
sha256 = "14713pbscysd6d0b9rgm7gg145jzwvgdn22778pf2v13qzvfmy1i";
}; };
NIX_CFLAGS_COMPILE="-fpermissive"; NIX_CFLAGS_COMPILE="-fpermissive";
@ -21,6 +22,7 @@ stdenv.mkDerivation rec {
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 # Features files (*.prf) are not installed on nixos

2
pkgs/top-level/all-packages.nix
View File

@ -5920,6 +5920,8 @@ let
inherit (gnome) gtkdoc; inherit (gnome) gtkdoc;
}; };
qt-mobility = callPackage ../development/libraries/qt-mobility {};
qt_gstreamer = callPackage ../development/libraries/gstreamer/legacy/qt-gstreamer {}; qt_gstreamer = callPackage ../development/libraries/gstreamer/legacy/qt-gstreamer {};
qt_gstreamer1 = callPackage ../development/libraries/gstreamer/qt-gstreamer { boost = boost156;}; qt_gstreamer1 = callPackage ../development/libraries/gstreamer/qt-gstreamer { boost = boost156;};