cambalache: 0.90.4 -> 0.94.1

This commit is contained in:
emaryn 2025-05-17 02:21:23 +08:00
parent e2aca92751
commit 7e3ae9893d

View file

@ -18,21 +18,21 @@
webkitgtk_4_1, webkitgtk_4_1,
webkitgtk_6_0, webkitgtk_6_0,
nix-update-script, nix-update-script,
casilda,
}: }:
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "cambalache"; pname = "cambalache";
version = "0.90.4"; version = "0.94.1";
pyproject = false;
format = "other";
# Did not fetch submodule since it is only for tests we don't run. # Did not fetch submodule since it is only for tests we don't run.
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.gnome.org"; domain = "gitlab.gnome.org";
owner = "jpu"; owner = "jpu";
repo = "cambalache"; repo = "cambalache";
rev = version; tag = version;
hash = "sha256-XS6JBJuifmN2ElCGk5hITbotZ+fqEdjopL6VqmMP2y4="; hash = "sha256-dX9YiBCBG/ALWX0W1CjvdUlOCQ6UulnQCiYUscRMKWk=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -60,6 +60,7 @@ python3.pkgs.buildPythonApplication rec {
# For extra widgets support. # For extra widgets support.
libadwaita libadwaita
libhandy libhandy
casilda
]; ];
# Prevent double wrapping. # Prevent double wrapping.
@ -67,25 +68,11 @@ python3.pkgs.buildPythonApplication rec {
postPatch = '' postPatch = ''
patchShebangs postinstall.py 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 = '' preFixup = ''
# Let python wrapper use GNOME flags. # Let python wrapper use GNOME flags.
makeWrapperArgs+=( makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
# For broadway daemons
--prefix PATH : "${
lib.makeBinPath [
gtk3
gtk4
]
}"
"''${gappsWrapperArgs[@]}"
)
''; '';
postFixup = '' postFixup = ''
@ -97,15 +84,15 @@ python3.pkgs.buildPythonApplication rec {
updateScript = nix-update-script { }; updateScript = nix-update-script { };
}; };
meta = with lib; { meta = {
homepage = "https://gitlab.gnome.org/jpu/cambalache"; homepage = "https://gitlab.gnome.org/jpu/cambalache";
description = "RAD tool for GTK 4 and 3 with data model first philosophy"; description = "RAD tool for GTK 4 and 3 with data model first philosophy";
mainProgram = "cambalache"; mainProgram = "cambalache";
teams = [ teams.gnome ]; teams = [ lib.teams.gnome ];
license = with licenses; [ license = with lib.licenses; [
lgpl21Only # Cambalache lgpl21Only # Cambalache
gpl2Only # tools gpl2Only # tools
]; ];
platforms = platforms.unix; platforms = lib.platforms.unix;
}; };
} }