git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #121934 from dotlambda/qtfeedback-init

libsForQt5.qtfeedback: init at unstable-2018-09-03

commit563c5037c94cfb5d6e89aff7221ddbffb069eac0 authorRobert Schütz <dev@schuetz-co.de> dateTue 25 May 2021, 14:52 (5 years ago) parentaad98168c9069d
3 files changed+58−9
pkgs/applications/networking/browsers/angelfish/default.nix+8−9 pkgs/development/libraries/qtfeedback/default.nix+48 pkgs/top-level/qt5-packages.nix+2
pkgs/applications/networking/browsers/angelfish/default.nix+8−9
@@ -1,6 +1,6 @@
11{ lib
22, mkDerivation
3−, fetchFromGitLab
3+, fetchurl
44, cmake
55, corrosion
66, extra-cmake-modules
@@ -12,6 +12,7 @@
1212, knotifications
1313, kpurpose
1414, kwindowsystem
15+, qtfeedback
1516, qtquickcontrols2
1617, qtwebengine
1718, rustPlatform
@@ -19,20 +20,17 @@
1920
2021mkDerivation rec {
2122 pname = "angelfish";
22− version = "1.8.0";
23+ version = "21.05";
2324
24− src = fetchFromGitLab {
25− domain = "invent.kde.org";
26− owner = "plasma-mobile";
27− repo = "angelfish";
28− rev = "v${version}";
29− sha256 = "0pj2kw7lmxh7diwdcmk24qxqslavhvf23r2i6h549gbllbzk219f";
25+ src = fetchurl {
26+ url = "mirror://kde/stable/plasma-mobile/${version}/angelfish-${version}.tar.xz";
27+ sha256 = "11jd5dwy0xa7kh5z5rc29xy3wfn20hm31908zjax4x83qqjrm075";
3028 };
3129
3230 cargoDeps = rustPlatform.fetchCargoTarball {
3331 inherit src;
3432 name = "${pname}-${version}";
35− sha256 = "0cyrmhlg0kjr14842ckbjdljc2zc28al0y9i8w5l0qzr18krgc0m";
33+ sha256 = "05xvh7yxndqm2bqpm06jsxiv4v02mqxaazll8wllp367qapvr21g";
3634 };
3735
3836 nativeBuildInputs = [
@@ -58,6 +56,7 @@ mkDerivation rec {
5856 knotifications
5957 kpurpose
6058 kwindowsystem
59+ qtfeedback
6160 qtquickcontrols2
6261 qtwebengine
6362 ];
pkgs/development/libraries/qtfeedback/default.nixnew file+48
@@ -0,0 +1,48 @@
1+{ lib
2+, mkDerivation
3+, fetchFromGitHub
4+, perl
5+, qmake
6+, qtbase
7+, qtdeclarative
8+}:
9+
10+mkDerivation rec {
11+ pname = "qtfeedback";
12+ version = "unstable-2018-09-03";
13+
14+ outputs = [ "out" "dev" ];
15+
16+ src = fetchFromGitHub {
17+ owner = "qt";
18+ repo = "qtfeedback";
19+ rev = "a14bd0bb1373cde86e09e3619fb9dc70f34c71f2";
20+ sha256 = "0kiiffvriagql1cark6g1qxy7l9c3q3s13cx3s2plbz19nlnikj7";
21+ };
22+
23+ nativeBuildInputs = [
24+ perl
25+ qmake
26+ ];
27+
28+ buildInputs = [
29+ qtdeclarative
30+ ];
31+
32+ qmakeFlags = [ "CONFIG+=git_build" ];
33+
34+ doCheck = true;
35+
36+ postFixup = ''
37+ # Drop QMAKE_PRL_BUILD_DIR because it references the build dir
38+ find "$out/lib" -type f -name '*.prl' \
39+ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
40+ '';
41+
42+ meta = with lib; {
43+ description = "Qt Tactile Feedback";
44+ homepage = "https://github.com/qt/qtfeedback";
45+ license = with licenses; [ lgpl3Only /* or */ gpl2Plus ];
46+ maintainers = with maintainers; [ dotlambda OPNA2608 ];
47+ };
48+}
pkgs/top-level/qt5-packages.nix+2
@@ -172,6 +172,8 @@ in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeGear // qt5 // {
172172 withQt5 = true;
173173 };
174174
175+ qtfeedback = callPackage ../development/libraries/qtfeedback { };
176+
175177 qtutilities = callPackage ../development/libraries/qtutilities { };
176178
177179 qtinstaller = callPackage ../development/libraries/qtinstaller { };