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

angelfish: init at 1.8.0

commit8b65ff2559c15d14e677db0cd89c03142098df30 authorRobert Schütz <dev@schuetz-co.de> dateSun 4 Apr 2021, 12:35 (6 years ago) parent7f46b19a0ec0bb
4 files changed+147
pkgs/applications/networking/browsers/angelfish/default.nix+71 pkgs/development/tools/build-managers/corrosion/cmake-install-full-dir.patch+18 pkgs/development/tools/build-managers/corrosion/default.nix+54 pkgs/top-level/all-packages.nix+4
pkgs/applications/networking/browsers/angelfish/default.nixnew file+71
@@ -0,0 +1,71 @@
1+{ lib
2+, mkDerivation
3+, fetchFromGitLab
4+, cmake
5+, corrosion
6+, extra-cmake-modules
7+, kconfig
8+, kcoreaddons
9+, kdbusaddons
10+, ki18n
11+, kirigami2
12+, knotifications
13+, kpurpose
14+, kwindowsystem
15+, qtquickcontrols2
16+, qtwebengine
17+, rustPlatform
18+}:
19+
20+mkDerivation rec {
21+ pname = "angelfish";
22+ version = "1.8.0";
23+
24+ src = fetchFromGitLab {
25+ domain = "invent.kde.org";
26+ owner = "plasma-mobile";
27+ repo = "angelfish";
28+ rev = "v${version}";
29+ sha256 = "0pj2kw7lmxh7diwdcmk24qxqslavhvf23r2i6h549gbllbzk219f";
30+ };
31+
32+ cargoDeps = rustPlatform.fetchCargoTarball {
33+ inherit src;
34+ name = "${pname}-${version}";
35+ sha256 = "0cyrmhlg0kjr14842ckbjdljc2zc28al0y9i8w5l0qzr18krgc0m";
36+ };
37+
38+ nativeBuildInputs = [
39+ cmake
40+ corrosion
41+ extra-cmake-modules
42+ ] ++ (with rustPlatform; [
43+ cargoSetupHook
44+ rust.cargo
45+ rust.rustc
46+ ]);
47+
48+ cmakeFlags = [
49+ "-DRust_CARGO=${rustPlatform.rust.cargo}/bin/cargo"
50+ ];
51+
52+ buildInputs = [
53+ kconfig
54+ kcoreaddons
55+ kdbusaddons
56+ ki18n
57+ kirigami2
58+ knotifications
59+ kpurpose
60+ kwindowsystem
61+ qtquickcontrols2
62+ qtwebengine
63+ ];
64+
65+ meta = with lib; {
66+ description = "Web browser for Plasma Mobile";
67+ homepage = "https://apps.kde.org/en/mobile.angelfish";
68+ license = licenses.gpl3Plus;
69+ maintainers = with maintainers; [ dotlambda ];
70+ };
71+}
pkgs/development/tools/build-managers/corrosion/cmake-install-full-dir.patchnew file+18
@@ -0,0 +1,18 @@
1+diff --git a/cmake/CorrosionConfig.cmake.in b/cmake/CorrosionConfig.cmake.in
2+index c042a00..491f53c 100644
3+--- a/cmake/CorrosionConfig.cmake.in
4++++ b/cmake/CorrosionConfig.cmake.in
5+@@ -4,11 +4,11 @@ if (Corrosion_FOUND)
6+ return()
7+ endif()
8+
9+-list(APPEND CMAKE_MODULE_PATH "${PACKAGE_PREFIX_DIR}/@CORROSION_INSTALL_PREFIX@@CMAKE_INSTALL_DATADIR@/cmake")
10++list(APPEND CMAKE_MODULE_PATH "@CMAKE_INSTALL_FULL_DATADIR@/cmake")
11+
12+ add_executable(Corrosion::Generator IMPORTED GLOBAL)
13+ set_property(
14+ TARGET Corrosion::Generator
15+- PROPERTY IMPORTED_LOCATION "${PACKAGE_PREFIX_DIR}/@CORROSION_INSTALL_PREFIX@@CMAKE_INSTALL_LIBEXECDIR@/corrosion-generator")
16++ PROPERTY IMPORTED_LOCATION "@CMAKE_INSTALL_FULL_LIBEXECDIR@/corrosion-generator")
17+
18+ include(Corrosion)
pkgs/development/tools/build-managers/corrosion/default.nixnew file+54
@@ -0,0 +1,54 @@
1+{ lib
2+, stdenv
3+, fetchFromGitHub
4+, cmake
5+, rustPlatform
6+}:
7+
8+stdenv.mkDerivation rec {
9+ pname = "corrosion";
10+ version = "unstable-2021-02-23";
11+
12+ src = fetchFromGitHub {
13+ owner = "AndrewGaspar";
14+ repo = "corrosion";
15+ rev = "e6c35c7e55a59c8223577b5abc4d253b4a82898b";
16+ sha256 = "0vq6g3ggnqiln0q8gsr8rr5rrdgpfcgfly79jwcygxrviw37m44d";
17+ };
18+
19+ patches = [
20+ # https://github.com/AndrewGaspar/corrosion/issues/84
21+ ./cmake-install-full-dir.patch
22+ ];
23+
24+ cargoRoot = "generator";
25+
26+ cargoDeps = rustPlatform.fetchCargoTarball {
27+ inherit src;
28+ sourceRoot = "${src.name}/${cargoRoot}";
29+ name = "${pname}-${version}";
30+ sha256 = "1fsq8zzzq28fj2fh92wmg8kmdj4y10mcpdmlgxsygy5lbh4xs13f";
31+ };
32+
33+ nativeBuildInputs = [
34+ cmake
35+ ] ++ (with rustPlatform; [
36+ cargoSetupHook
37+ rust.cargo
38+ rust.rustc
39+ ]);
40+
41+ cmakeFlags = [
42+ "-DRust_CARGO=${rustPlatform.rust.cargo}/bin/cargo"
43+
44+ # tests cannot find cargo because Rust_CARGO is unset before tests
45+ "-DCORROSION_BUILD_TESTS=OFF"
46+ ];
47+
48+ meta = with lib; {
49+ description = "Tool for integrating Rust into an existing CMake project";
50+ homepage = "https://github.com/AndrewGaspar/corrosion";
51+ license = licenses.mit;
52+ maintainers = with maintainers; [ dotlambda ];
53+ };
54+}
pkgs/top-level/all-packages.nix+4
@@ -12403,6 +12403,8 @@ in
1240312403
1240412404 cookiecutter = with python3Packages; toPythonApplication cookiecutter;
1240512405
12406+ corrosion = callPackage ../development/tools/build-managers/corrosion { };
12407+
1240612408 corundum = callPackage ../development/tools/corundum { };
1240712409
1240812410 confluent-platform = callPackage ../servers/confluent-platform {};
@@ -21711,6 +21713,8 @@ in
2171121713 });
2171221714 android-studio = androidStudioPackages.stable;
2171321715
21716+ angelfish = libsForQt5.callPackage ../applications/networking/browsers/angelfish { };
21717+
2171421718 animbar = callPackage ../applications/graphics/animbar { };
2171521719
2171621720 antfs-cli = callPackage ../applications/misc/antfs-cli {};