conduktor: 2.15.1 -> 2.24.9

Diff: https://github.com/conduktor/builds/compare/v2.15.1...v2.24.9

Changelog: https://www.conduktor.io/changelog/#2.24.9

authored by emaryn and committed by emaryn 08c47b7d 52c2d786

+44 -21
+44 -21
pkgs/by-name/co/conduktor/package.nix
··· 1 1 { 2 - stdenv, 3 2 lib, 3 + stdenv, 4 4 fetchurl, 5 5 fetchzip, 6 6 jdk11, 7 - makeWrapper, 7 + openjfx17, 8 + gtk3, 9 + glib, 10 + pango, 11 + cairo, 12 + gdk-pixbuf, 13 + xorg, 14 + makeBinaryWrapper, 8 15 makeDesktopItem, 9 16 copyDesktopItems, 10 17 }: 11 18 12 - stdenv.mkDerivation rec { 19 + let 20 + openjfx_jdk = openjfx17.override { withWebKit = true; }; 21 + in 22 + stdenv.mkDerivation (finalAttrs: { 13 23 pname = "conduktor"; 14 - version = "2.15.1"; 24 + version = "2.24.9"; 15 25 16 26 src = fetchzip { 17 - url = "https://github.com/conduktor/builds/releases/download/v${version}/Conduktor-linux-${version}.zip"; 18 - sha256 = "sha256-9y/7jni5zIITUWd75AxsfG/b5vCYotmeMeC9aYM2WEs="; 27 + url = "https://github.com/conduktor/builds/releases/download/v${finalAttrs.version}/Conduktor-linux-${finalAttrs.version}.zip"; 28 + hash = "sha256-c9QjlKPZpeJi5YTq4gm+sg7my4EP0LI95AfGguF4ork="; 19 29 }; 20 30 21 31 nativeBuildInputs = [ 22 - makeWrapper 32 + makeBinaryWrapper 23 33 copyDesktopItems 24 34 ]; 25 35 26 36 desktopItems = [ 27 37 (makeDesktopItem { 28 38 type = "Application"; 29 - name = pname; 39 + name = "conduktor"; 30 40 desktopName = "Conduktor"; 31 - genericName = meta.description; 32 - exec = pname; 41 + genericName = finalAttrs.meta.description; 42 + exec = "conduktor"; 33 43 icon = fetchurl { 34 - url = "https://github.com/conduktor/builds/raw/v${version}/.github/resources/Conduktor.png"; 35 - sha256 = "0s7p74qclvac8xj2m22gfxx5m2c7cf0nqpk5sb049p2wvryhn2j4"; 44 + url = "https://github.com/conduktor/builds/raw/v${finalAttrs.version}/.github/resources/Conduktor.png"; 45 + hash = "sha256-mk4c9ecookRb7gR56cedIWfPfQy2uGF+ZbX6NI90KI0="; 36 46 }; 37 47 comment = "A beautiful and fully-featured desktop client for Apache Kafka"; 38 48 }) ··· 44 54 installPhase = '' 45 55 runHook preInstall 46 56 47 - mkdir -p $out/share/applications 48 - mv * $out 49 - wrapProgram "$out/bin/conduktor" --set JAVA_HOME "${jdk11.home}" 57 + cp -r . $out 58 + wrapProgram $out/bin/conduktor \ 59 + --set JAVA_HOME ${jdk11.home} \ 60 + --set LD_LIBRARY_PATH ${ 61 + lib.makeLibraryPath [ 62 + openjfx_jdk 63 + gtk3 64 + gtk3 65 + glib 66 + pango 67 + cairo 68 + gdk-pixbuf 69 + xorg.libXtst 70 + ] 71 + } \ 72 + --add-flags "--module-path ${openjfx_jdk}/lib --add-modules=javafx.controls,javafx.fxml" 50 73 51 74 runHook postInstall 52 75 ''; 53 76 54 - meta = with lib; { 77 + meta = { 55 78 description = "Apache Kafka Desktop Client"; 56 79 longDescription = '' 57 80 Conduktor is a GUI over the Kafka ecosystem, to make the development 58 81 and management of Apache Kafka clusters as easy as possible. 59 82 ''; 60 83 homepage = "https://www.conduktor.io/"; 61 - changelog = "https://www.conduktor.io/changelog/#${version}"; 62 - license = licenses.unfree; 63 - maintainers = with maintainers; [ trobert ]; 64 - platforms = platforms.linux; 84 + changelog = "https://www.conduktor.io/changelog/#${finalAttrs.version}"; 85 + license = lib.licenses.unfree; 86 + maintainers = with lib.maintainers; [ trobert ]; 87 + platforms = lib.platforms.linux; 65 88 }; 66 - } 89 + })