From c5457ebd9b3424b59b7908f35cbe741d6ae7fe6b Mon Sep 17 00:00:00 2001 From: Forkk Date: Tue, 14 Apr 2015 13:31:39 -0500 Subject: [PATCH] qt-mobility: fix package 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). --- pkgs/development/libraries/qt-mobility/default.nix | 12 +++++++----- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/qt-mobility/default.nix b/pkgs/development/libraries/qt-mobility/default.nix index 71ec5e77a73..0cb62914b7f 100644 --- a/pkgs/development/libraries/qt-mobility/default.nix +++ b/pkgs/development/libraries/qt-mobility/default.nix @@ -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 stdenv.mkDerivation rec { version = "1.2.0"; name = "qt-mobility-${version}"; - download = "qt-mobility-opensource-src-${version}"; - src = fetchurl { - url = "http://get.qt.nokia.com/qt/add-ons/${download}.tar.gz"; - sha256 = "ee3c88975e04139ac9589f76d4be646d44fcbc4c8c1cf2db621abc154cf0ba44"; + src = fetchFromGitHub { + owner = "qtproject"; + repo = "qt-mobility"; + rev = "v${version}"; + sha256 = "14713pbscysd6d0b9rgm7gg145jzwvgdn22778pf2v13qzvfmy1i"; }; NIX_CFLAGS_COMPILE="-fpermissive"; @@ -21,6 +22,7 @@ stdenv.mkDerivation rec { preBuild = '' 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/" + done ''; # Features files (*.prf) are not installed on nixos diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 766dd90d25a..c115a32c621 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5920,6 +5920,8 @@ let inherit (gnome) gtkdoc; }; + qt-mobility = callPackage ../development/libraries/qt-mobility {}; + qt_gstreamer = callPackage ../development/libraries/gstreamer/legacy/qt-gstreamer {}; qt_gstreamer1 = callPackage ../development/libraries/gstreamer/qt-gstreamer { boost = boost156;};