diff options
| -rw-r--r-- | pkgs/applications/networking/browsers/angelfish/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/development/libraries/qtfeedback/default.nix | 48 | ||||
| -rw-r--r-- | pkgs/top-level/qt5-packages.nix | 2 |
3 files changed, 58 insertions, 9 deletions
diff --git a/pkgs/applications/networking/browsers/angelfish/default.nix b/pkgs/applications/networking/browsers/angelfish/default.nix index 831fabf2deb..7fb2703199a 100644 --- a/pkgs/applications/networking/browsers/angelfish/default.nix +++ b/pkgs/applications/networking/browsers/angelfish/default.nix @@ -1,6 +1,6 @@ { lib , mkDerivation -, fetchFromGitLab +, fetchurl , cmake , corrosion , extra-cmake-modules @@ -12,6 +12,7 @@ , knotifications , kpurpose , kwindowsystem +, qtfeedback , qtquickcontrols2 , qtwebengine , rustPlatform @@ -19,20 +20,17 @@ mkDerivation rec { pname = "angelfish"; - version = "1.8.0"; + version = "21.05"; - src = fetchFromGitLab { - domain = "invent.kde.org"; - owner = "plasma-mobile"; - repo = "angelfish"; - rev = "v${version}"; - sha256 = "0pj2kw7lmxh7diwdcmk24qxqslavhvf23r2i6h549gbllbzk219f"; + src = fetchurl { + url = "mirror://kde/stable/plasma-mobile/${version}/angelfish-${version}.tar.xz"; + sha256 = "11jd5dwy0xa7kh5z5rc29xy3wfn20hm31908zjax4x83qqjrm075"; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "0cyrmhlg0kjr14842ckbjdljc2zc28al0y9i8w5l0qzr18krgc0m"; + sha256 = "05xvh7yxndqm2bqpm06jsxiv4v02mqxaazll8wllp367qapvr21g"; }; nativeBuildInputs = [ @@ -58,6 +56,7 @@ mkDerivation rec { knotifications kpurpose kwindowsystem + qtfeedback qtquickcontrols2 qtwebengine ]; diff --git a/pkgs/development/libraries/qtfeedback/default.nix b/pkgs/development/libraries/qtfeedback/default.nix new file mode 100644 index 00000000000..a329ece074b --- /dev/null +++ b/pkgs/development/libraries/qtfeedback/default.nix @@ -0,0 +1,48 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, perl +, qmake +, qtbase +, qtdeclarative +}: + +mkDerivation rec { + pname = "qtfeedback"; + version = "unstable-2018-09-03"; + + outputs = [ "out" "dev" ]; + + src = fetchFromGitHub { + owner = "qt"; + repo = "qtfeedback"; + rev = "a14bd0bb1373cde86e09e3619fb9dc70f34c71f2"; + sha256 = "0kiiffvriagql1cark6g1qxy7l9c3q3s13cx3s2plbz19nlnikj7"; + }; + + nativeBuildInputs = [ + perl + qmake + ]; + + buildInputs = [ + qtdeclarative + ]; + + qmakeFlags = [ "CONFIG+=git_build" ]; + + doCheck = true; + + postFixup = '' + # Drop QMAKE_PRL_BUILD_DIR because it references the build dir + find "$out/lib" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; + ''; + + meta = with lib; { + description = "Qt Tactile Feedback"; + homepage = "https://github.com/qt/qtfeedback"; + license = with licenses; [ lgpl3Only /* or */ gpl2Plus ]; + maintainers = with maintainers; [ dotlambda OPNA2608 ]; + }; +} diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 7922750e959..60b4609479d 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -172,6 +172,8 @@ in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeGear // qt5 // { withQt5 = true; }; + qtfeedback = callPackage ../development/libraries/qtfeedback { }; + qtutilities = callPackage ../development/libraries/qtutilities { }; qtinstaller = callPackage ../development/libraries/qtinstaller { }; |