eddie-ui: init at 2.20.0 #105195

vanbeast · 2020-11-28T02:18:09Z

Motivation for this change

#73233
Used build scripts for Arch as a reference.

Things done

Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
Built on platform(s)
- [X ] NixOS
- macOS
- other Linux distributions
Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
[ X] Tested execution of all binary files (usually in ./result/bin/)
Determined the impact on package closure size (by running nix path-info -S before and after)
Ensured that relevant documentation is up to date
Fits CONTRIBUTING.md.

SuperSandro2000 · 2020-11-28T02:50:46Z

pkgs/applications/networking/eddie-ui/default.nix

+{ stdenv,
+  fetchFromGitHub,
+  clang,
+  cmake,
+  mono,
+  dotnet-sdk,
+  which,
+  glibc,
+  pkgconfig,
+  gtk2,
+  libappindicator-gtk2,
+  lzma,
+  libselinux,
+  libsepol,
+  fribidi,
+  libthai,
+  libdatrie,
+  xorg,
+  openvpn,
+  stunnel
+  }:


Suggested change

{ stdenv,

fetchFromGitHub,

clang,

cmake,

mono,

dotnet-sdk,

which,

glibc,

pkgconfig,

gtk2,

libappindicator-gtk2,

lzma,

libselinux,

libsepol,

fribidi,

libthai,

libdatrie,

xorg,

openvpn,

stunnel

}:

{ stdenv

, fetchFromGitHub,

, clang

, cmake

....

}:

I am lazy now but the formatting should be like the above example.

SuperSandro2000 · 2020-11-28T02:51:03Z

pkgs/applications/networking/eddie-ui/default.nix

+
+stdenv.mkDerivation rec {
+  pname = "eddie-ui";
+  version = "2.18.9";


Suggested change

version = "2.18.9";

version = "2.18.9";

pkgs/applications/networking/eddie-ui/default.nix

SuperSandro2000 · 2020-11-28T02:52:05Z

pkgs/applications/networking/eddie-ui/default.nix

+  src = fetchFromGitHub {
+    owner = "AirVPN";
+    repo = "Eddie";
+    rev = "2.18.9";


Suggested change

rev = "2.18.9";

rev = version;

Otherwise we won't get auto updates.

SuperSandro2000 · 2020-11-28T02:52:50Z

pkgs/applications/networking/eddie-ui/default.nix

+    rev = "2.18.9";
+    sha256 = "1nvnvy6lskydfrlsrbyk065hl6zxdyivhrynydny1kirz3qmrw61";
+  };
+  sourceRoot= "/build/source/src/UI.GTK.Linux.Tray";


Suggested change

sourceRoot= "/build/source/src/UI.GTK.Linux.Tray";

IIRC this is not required here.

If I remove this line, I need to add
dontUseCmakeConfigure=true;
Otherwise I get the error:
CMake Error: The source directory "/build/source" does not appear to contain CMakeLists.txt.
Also, when I skip configure phase with the option above I have an error while building:

/build/source/src/UI.GTK.Linux.Tray/src/main.cpp:22:10: fatal error: libappindicator/app-indicator.h: No such file or directory 22 | #include <libappindicator/app-indicator.h>

Looks like in this case I need to provide some cmake flags manually.

Suggested change

sourceRoot= "/build/source/src/UI.GTK.Linux.Tray";

sourceRoot= "src/UI.GTK.Linux.Tray";

This should be relative and not absolute.

SuperSandro2000 · 2020-11-28T02:55:56Z

pkgs/applications/networking/eddie-ui/default.nix

+                    libselinux libsepol fribidi libthai libdatrie xorg.libXdmcp
+  ]; 
+  installPhase = ''


Suggested change

libselinux libsepol fribidi libthai libdatrie xorg.libXdmcp

];

installPhase = ''

libselinux libsepol fribidi libthai libdatrie xorg.libXdmcp

];

installPhase = ''

pkgs/applications/networking/eddie-ui/default.nix

SuperSandro2000 · 2020-11-28T02:56:39Z

pkgs/applications/networking/eddie-ui/default.nix

+    cp repository/linux_arch/bundle/eddie-ui/usr/bin/eddie-ui $out/bin/eddie-ui
+    substituteInPlace $out/bin/eddie-ui --replace '/usr/' $out/
+    chmod +x $out/bin/eddie-ui


Suggested change

cp repository/linux_arch/bundle/eddie-ui/usr/bin/eddie-ui $out/bin/eddie-ui

substituteInPlace $out/bin/eddie-ui --replace '/usr/' $out/

chmod +x $out/bin/eddie-ui

install -Dm755 repository/linux_arch/bundle/eddie-ui/usr/bin/eddie-ui $out/bin/eddie-ui

substituteInPlace $out/bin/eddie-ui --replace '/usr/' $out/

Regarding this part. I wanted to ask maybe there is a better way instead of copying Arch script. The script is:
mono /usr/lib/eddie-ui/eddie-ui.exe --path.resources=/usr/share/eddie-ui --path.exec="$0" "$@".
Can we use some Nix wrapper function here?

I am not sure but it could be that the binary gets double wrapped.

makeWrapper has an --add-flags option which can do that.

SuperSandro2000 · 2020-11-28T02:57:16Z

pkgs/applications/networking/eddie-ui/default.nix

+        Eddie - OpenVPN GUI, A VPN based on OpenVPN and operated by activists and hacktivists in defence of net neutrality, privacy and against censorship.
+    '';
+    homepage = "https://airvpn.org/";
+    changelog = "https://github.com/AirVPN/Eddie/compare/2.18.9...master";


Suggested change

changelog = "https://github.com/AirVPN/Eddie/compare/2.18.9...master";

changelog = "https://github.com/AirVPN/Eddie/releases";

SuperSandro2000 · 2020-11-28T02:57:50Z

pkgs/applications/networking/eddie-ui/default.nix

+    homepage = "https://airvpn.org/";
+    changelog = "https://github.com/AirVPN/Eddie/compare/2.18.9...master";
+    maintainers = with maintainers; [vanbeast];
+    license = licenses.gpl3;


gpl3 is deprecated. Please set gpl3Plus or gpl3Only.

SuperSandro2000

Please fix the merge conflict and do not merge master into PRs.

SuperSandro2000 · 2020-12-27T23:38:35Z

pkgs/top-level/all-packages.nix

@@ -28675,4 +28675,6 @@ in

  psftools = callPackage ../os-specific/linux/psftools {};

+  eddie-ui = callPackage ../applications/networking/eddie-ui/default.nix {};


Please sort this into a fitting category and there alphabetically.

Suggested change

eddie-ui = callPackage ../applications/networking/eddie-ui/default.nix {};

eddie-ui = callPackage ../applications/networking/eddie-ui/default.nix { };

vanbeast · 2021-03-19T05:29:39Z

Hi @SuperSandro2000
Sorry, didn't have time to fix the PR. Now it's updated. Could you please check buildInputs and nativeBuildInputs? It needs mono, openvpn and stunnel at runtime. Is it correct to put them in buildInputs?

vanbeast · 2021-03-19T08:36:28Z

@SuperSandro2000 Did some cleanup according to your comments. Please review

SuperSandro2000 · 2021-03-19T18:57:07Z

maintainers/maintainer-list.nix

@@ -10924,4 +10924,10 @@
    github = "zupo";
    githubId = 311580;
  };
+  vanbeast = {


Please put this into a separate commit with the message maintainers: add vanbeast.

Do you mean separate PR or just separate commit in this PR?

Please put this into a separate commit with the message maintainers: add vanbeast and sort it alphabetically.

SuperSandro2000 · 2021-03-19T18:57:28Z

pkgs/applications/networking/eddie-ui/default.nix

+    sha256 = "0wack2xc5vk2b5i6knhqqcppdc3cml1swys3kprdpazrcim79yvg";
+  };
+
+  buildInputs = [openvpn mono stunnel];


Suggested change

buildInputs = [openvpn mono stunnel];

buildInputs = [ openvpn mono stunnel ];

SuperSandro2000 · 2021-03-19T18:57:43Z

pkgs/applications/networking/eddie-ui/default.nix

+  nativeBuildInputs = [pkg-config which cmake dotnet-sdk gtk2 lzma.dev libappindicator-gtk2.dev
+                    libselinux libsepol fribidi libthai libdatrie xorg.libXdmcp
+  ];


Suggested change

nativeBuildInputs = [pkg-config which cmake dotnet-sdk gtk2 lzma.dev libappindicator-gtk2.dev

libselinux libsepol fribidi libthai libdatrie xorg.libXdmcp

];

nativeBuildInputs = [

pkg-config which cmake dotnet-sdk gtk2 lzma.dev libappindicator-gtk2.dev

libselinux libsepol fribidi libthai libdatrie xorg.libXdmcp

];

SuperSandro2000 · 2021-03-19T18:58:19Z

pkgs/applications/networking/eddie-ui/default.nix

+    rev = "2.18.9";
+    sha256 = "1nvnvy6lskydfrlsrbyk065hl6zxdyivhrynydny1kirz3qmrw61";
+  };
+  sourceRoot= "/build/source/src/UI.GTK.Linux.Tray";


Suggested change

sourceRoot= "/build/source/src/UI.GTK.Linux.Tray";

sourceRoot= "src/UI.GTK.Linux.Tray";

This should be relative and not absolute.

SuperSandro2000 · 2021-03-19T18:58:36Z

pkgs/applications/networking/eddie-ui/default.nix

+
+  postPatch = ''
+    # Fix libappindicator include directory
+    substituteInPlace /build/source/src/UI.GTK.Linux.Tray/CMakeLists.txt --replace '/usr/include/libappindicator-0.1' '${libappindicator-gtk2.dev}/include/libappindicator-0.1';


Suggested change

substituteInPlace /build/source/src/UI.GTK.Linux.Tray/CMakeLists.txt --replace '/usr/include/libappindicator-0.1' '${libappindicator-gtk2.dev}/include/libappindicator-0.1';

substituteInPlace /build/source/src/UI.GTK.Linux.Tray/CMakeLists.txt \

--replace '/usr/include/libappindicator-0.1' '${libappindicator-gtk2.dev}/include/libappindicator-0.1';

SuperSandro2000 · 2021-03-19T18:59:01Z

pkgs/applications/networking/eddie-ui/default.nix

+    chmod -R +w /build/source
+    cd /build/source/src/


Or alternatively use relative paths.

SuperSandro2000 · 2021-03-19T19:00:11Z

pkgs/applications/networking/eddie-ui/default.nix

+    cp repository/linux_arch/bundle/eddie-ui/usr/bin/eddie-ui $out/bin/eddie-ui
+    substituteInPlace $out/bin/eddie-ui --replace '/usr/' $out/
+    chmod +x $out/bin/eddie-ui


I am not sure but it could be that the binary gets double wrapped.

SuperSandro2000 · 2021-03-19T19:00:43Z

pkgs/applications/networking/eddie-ui/default.nix

+    longDescription = ''
+        Eddie - OpenVPN GUI for AirVPN. AirVPN is based on OpenVPN and operated by activists and hacktivists in defence of net neutrality, privacy and against censorship.
+    '';


Suggested change

longDescription = ''

Eddie - OpenVPN GUI for AirVPN. AirVPN is based on OpenVPN and operated by activists and hacktivists in defence of net neutrality, privacy and against censorship.

'';

longDescription = ''

Eddie is a OpenVPN GUI for AirVPN. AirVPN is based on OpenVPN and operated by activists and hacktivists in defence of net neutrality, privacy and against censorship.

'';

vanbeast · 2021-03-23T06:54:06Z

@SuperSandro2000
substituteInPlace src/App.CLI.Linux.Elevated/build.sh --replace '-static -pthread' '-pthread'
Regarding the line above. I'm removing -static option because otherwise I have these errors:
...binutils-2.35.1/bin/ld: cannot find -lpthread
...binutils-2.35.1/bin/ld: cannot find -lm
...binutils-2.35.1/bin/ld: cannot find -lpthread
...binutils-2.35.1/bin/ld: cannot find -lc

Do you have an idea how it can be fixed?
Also, we want packages mono, openvpn and stunnel installed together with eddie-ui. Can we add something to default.nix to ensure this?

SuperSandro2000 · 2021-04-06T00:56:35Z

@SuperSandro2000
substituteInPlace src/App.CLI.Linux.Elevated/build.sh --replace '-static -pthread' '-pthread'
Regarding the line above. I'm removing -static option because otherwise I have these errors:
...binutils-2.35.1/bin/ld: cannot find -lpthread
...binutils-2.35.1/bin/ld: cannot find -lm
...binutils-2.35.1/bin/ld: cannot find -lpthread
...binutils-2.35.1/bin/ld: cannot find -lc

Do you have an idea how it can be fixed?
Also, we want packages mono, openvpn and stunnel installed together with eddie-ui. Can we add something to default.nix to ensure this?

I don't know. Probably static compilation is not supported like this.

You can use makeWrapper to put those programs into the PATH if you mean this. Otherwise you need to create a module which puts those packages into systemPackages.

vanbeast · 2021-04-12T02:26:06Z

Thanks Sandro. I made this PR a draft. I will need to spend some time to figure out those issues

stale · 2021-10-12T14:43:34Z

I marked this as stale due to inactivity. → More info

chrisdebian · 2023-07-03T21:57:27Z

Hi, guys.

Is the work in AirVPN/ eddie-ui dead? I'm considering distrohopping and making NixOS my main OS. I do need AirVPN/ eddie, though. I guess it's probably available as a Flatpak, if not from NixOS.

Thanks,

Chris

DavidOliver · 2023-07-03T22:13:46Z

I'd also like to use Eddie. In the meantime, I've found that sudo openvpn <openvpn config file downloaded from airvpn's config generator tool> works well. I believe firewall rules can block traffic other than that of the tun.

vanbeast · 2023-07-03T23:14:20Z

I've stopped using NixOS, so I'm not going to work on this package anymore

SuperSandro2000 reviewed Nov 28, 2020

View reviewed changes

SuperSandro2000 added the 2.status: merge conflict label Dec 27, 2020

SuperSandro2000 requested changes Dec 27, 2020

View reviewed changes

SuperSandro2000 reviewed Dec 27, 2020

View reviewed changes

vanbeast force-pushed the eddieui-pkg branch from 21dadc1 to f752e28 Compare March 19, 2021 04:55

vanbeast changed the title ~~eddie-ui: init at 2.18.9~~ eddie-ui: init at 2.20.0 Mar 19, 2021

ofborg bot removed the 2.status: merge conflict label Mar 19, 2021

vanbeast force-pushed the eddieui-pkg branch from f752e28 to d164fbd Compare March 19, 2021 05:19

vanbeast force-pushed the eddieui-pkg branch 3 times, most recently from 554f2df to 1ab6510 Compare March 19, 2021 08:35

ofborg bot added 8.has: package (new) 11.by: package-maintainer 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Mar 19, 2021

SuperSandro2000 requested changes Mar 19, 2021

View reviewed changes

vanbeast force-pushed the eddieui-pkg branch 2 times, most recently from 8ff6884 to 9a609eb Compare March 23, 2021 06:36

vanbeast force-pushed the eddieui-pkg branch 2 times, most recently from 9c622d3 to 1da2d55 Compare March 23, 2021 07:02

vanbeast and others added 2 commits March 23, 2021 02:08

eddie-ui: init at 2.20.0

cce47ea

maintainers: add vanbeast

70de5e3

vanbeast force-pushed the eddieui-pkg branch from 4634edb to 70de5e3 Compare March 23, 2021 07:08

ofborg bot added 10.rebuild-darwin: 0 and removed 10.rebuild-darwin: 1 labels Mar 23, 2021

ofborg bot removed the 10.rebuild-darwin: 1-10 label Mar 23, 2021

vanbeast marked this pull request as draft April 12, 2021 02:25

stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Oct 12, 2021

Janik-Haag added the 12. first-time contribution label Jun 12, 2023

stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jun 12, 2023

SuperSandro2000 closed this Jul 14, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

eddie-ui: init at 2.20.0 #105195

eddie-ui: init at 2.20.0 #105195

vanbeast commented Nov 28, 2020

SuperSandro2000 Nov 28, 2020

SuperSandro2000 Nov 28, 2020

SuperSandro2000 Nov 28, 2020

SuperSandro2000 Nov 28, 2020

vanbeast Nov 28, 2020

SuperSandro2000 Mar 19, 2021

SuperSandro2000 Nov 28, 2020

SuperSandro2000 Nov 28, 2020

vanbeast Nov 28, 2020

SuperSandro2000 Mar 19, 2021

SuperSandro2000 Apr 6, 2021

SuperSandro2000 Nov 28, 2020

SuperSandro2000 Nov 28, 2020

SuperSandro2000 left a comment

SuperSandro2000 Dec 27, 2020 •

edited

vanbeast commented Mar 19, 2021

vanbeast commented Mar 19, 2021

SuperSandro2000 Mar 19, 2021

vanbeast Mar 23, 2021

SuperSandro2000 Apr 6, 2021

SuperSandro2000 Mar 19, 2021

SuperSandro2000 Mar 19, 2021

SuperSandro2000 Mar 19, 2021

SuperSandro2000 Mar 19, 2021

SuperSandro2000 Mar 19, 2021

SuperSandro2000 Mar 19, 2021

SuperSandro2000 Mar 19, 2021

vanbeast commented Mar 23, 2021

SuperSandro2000 commented Apr 6, 2021 •

edited

vanbeast commented Apr 12, 2021

stale bot commented Oct 12, 2021

chrisdebian commented Jul 3, 2023

DavidOliver commented Jul 3, 2023

vanbeast commented Jul 3, 2023

	sourceRoot= "/build/source/src/UI.GTK.Linux.Tray";
	sourceRoot= "src/UI.GTK.Linux.Tray";

	changelog = "https://github.com/AirVPN/Eddie/compare/2.18.9...master";
	changelog = "https://github.com/AirVPN/Eddie/releases";

		@@ -28675,4 +28675,6 @@ in

		psftools = callPackage ../os-specific/linux/psftools {};

		eddie-ui = callPackage ../applications/networking/eddie-ui/default.nix {};

	buildInputs = [openvpn mono stunnel];
	buildInputs = [ openvpn mono stunnel ];

	substituteInPlace /build/source/src/UI.GTK.Linux.Tray/CMakeLists.txt --replace '/usr/include/libappindicator-0.1' '${libappindicator-gtk2.dev}/include/libappindicator-0.1';
	substituteInPlace /build/source/src/UI.GTK.Linux.Tray/CMakeLists.txt \
	--replace '/usr/include/libappindicator-0.1' '${libappindicator-gtk2.dev}/include/libappindicator-0.1';

eddie-ui: init at 2.20.0 #105195

eddie-ui: init at 2.20.0 #105195

Conversation

vanbeast commented Nov 28, 2020

Motivation for this change

Things done

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SuperSandro2000 left a comment

Choose a reason for hiding this comment

SuperSandro2000 Dec 27, 2020 • edited

Choose a reason for hiding this comment

vanbeast commented Mar 19, 2021

vanbeast commented Mar 19, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vanbeast commented Mar 23, 2021

SuperSandro2000 commented Apr 6, 2021 • edited

vanbeast commented Apr 12, 2021

stale bot commented Oct 12, 2021

chrisdebian commented Jul 3, 2023

DavidOliver commented Jul 3, 2023

vanbeast commented Jul 3, 2023

SuperSandro2000 Dec 27, 2020 •

edited

SuperSandro2000 commented Apr 6, 2021 •

edited