diff --git a/pkgs/by-name/ca/cambalache/package.nix b/pkgs/by-name/ca/cambalache/package.nix index f81709606017..0e10ba9b654e 100644 --- a/pkgs/by-name/ca/cambalache/package.nix +++ b/pkgs/by-name/ca/cambalache/package.nix @@ -18,21 +18,21 @@ webkitgtk_4_1, webkitgtk_6_0, nix-update-script, + casilda, }: python3.pkgs.buildPythonApplication rec { pname = "cambalache"; - version = "0.90.4"; - - format = "other"; + version = "0.94.1"; + pyproject = false; # Did not fetch submodule since it is only for tests we don't run. src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "jpu"; repo = "cambalache"; - rev = version; - hash = "sha256-XS6JBJuifmN2ElCGk5hITbotZ+fqEdjopL6VqmMP2y4="; + tag = version; + hash = "sha256-dX9YiBCBG/ALWX0W1CjvdUlOCQ6UulnQCiYUscRMKWk="; }; nativeBuildInputs = [ @@ -60,6 +60,7 @@ python3.pkgs.buildPythonApplication rec { # For extra widgets support. libadwaita libhandy + casilda ]; # Prevent double wrapping. @@ -67,25 +68,11 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' patchShebangs postinstall.py - # those programs are used at runtime not build time - # https://gitlab.gnome.org/jpu/cambalache/-/blob/0.12.1/meson.build#L79-80 - substituteInPlace ./meson.build \ - --replace-fail "find_program('broadwayd', required: true)" "" \ - --replace-fail "find_program('gtk4-broadwayd', required: true)" "" ''; preFixup = '' # Let python wrapper use GNOME flags. - makeWrapperArgs+=( - # For broadway daemons - --prefix PATH : "${ - lib.makeBinPath [ - gtk3 - gtk4 - ] - }" - "''${gappsWrapperArgs[@]}" - ) + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; postFixup = '' @@ -97,15 +84,15 @@ python3.pkgs.buildPythonApplication rec { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { homepage = "https://gitlab.gnome.org/jpu/cambalache"; description = "RAD tool for GTK 4 and 3 with data model first philosophy"; mainProgram = "cambalache"; - teams = [ teams.gnome ]; - license = with licenses; [ + teams = [ lib.teams.gnome ]; + license = with lib.licenses; [ lgpl21Only # Cambalache gpl2Only # tools ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; }