Merge pull request #230885 from milran/onioncircuits-0-5-0-7

Sandro 7c3a9e42 d5d656bb

Changed files
+42 -13
pkgs
tools
security
onioncircuits
+42 -13
pkgs/tools/security/onioncircuits/default.nix
···
-
{ stdenv, lib, fetchgit, python3, intltool, gtk3, gobject-introspection, gnome }:
+
{ stdenv
+
, lib
+
, fetchFromGitLab
+
, fetchpatch
+
, gnome
+
, gobject-introspection
+
, gtk3
+
, intltool
+
, python3
+
, wrapGAppsHook
+
}:
python3.pkgs.buildPythonApplication rec {
pname = "onioncircuits";
-
version = "0.5";
+
version = "0.7";
-
src = fetchgit {
-
url = "https://git-tails.immerda.ch/onioncircuits/";
+
src = fetchFromGitLab {
+
domain = "gitlab.tails.boum.org";
+
owner = "tails";
+
repo = "onioncircuits";
rev = version;
-
sha256 = "13mqif9b9iajpkrl9ijspdnvy82kxhprxd5mw3njk68rcn4z2pcm";
+
sha256 = "sha256-O4tSbKBTmve4u8bXVg128RLyuxvTbU224JV8tQ+aDAQ=";
};
-
nativeBuildInputs = [ intltool ];
-
buildInputs = [ gtk3 gobject-introspection ];
-
propagatedBuildInputs = with python3.pkgs; [ stem distutils_extra pygobject3 ];
+
nativeBuildInputs = [
+
gobject-introspection
+
intltool
+
wrapGAppsHook
+
python3.pkgs.distutils_extra
+
];
+
+
propagatedBuildInputs = with python3.pkgs; [
+
pygobject3
+
stem
+
];
+
+
patches = [
+
# Fix https://gitlab.tails.boum.org/tails/onioncircuits/-/merge_requests/4
+
(fetchpatch {
+
name = "fix-setuptool-package-discovery.patch";
+
url = "https://gitlab.tails.boum.org/tails/onioncircuits/-/commit/4c620c77f36f540fa27041fcbdeaf05c9f57826c.patch";
+
sha256 = "sha256-WXqyDa2meRMMHkHLO5Xl7x43KUGtlsai+eOVzUGUPpo=";
+
})
+
];
+
+
postInstall = ''
+
mkdir -p $out/etc/apparmor.d
-
postFixup = ''
-
wrapProgram "$out/bin/onioncircuits" \
-
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-
--prefix XDG_DATA_DIRS : "$out/share:${gnome.adwaita-icon-theme}/share"
+
cp apparmor/usr.bin.onioncircuits $out/etc/apparmor.d
'';
meta = with lib; {
···
homepage = "https://tails.boum.org";
description = "GTK application to display Tor circuits and streams";
license = licenses.gpl3;
-
maintainers = [ ];
+
maintainers = with maintainers; [ milran ];
};
}