diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/networking/onionshare/default.nix')
-rw-r--r-- | nixpkgs/pkgs/applications/networking/onionshare/default.nix | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/applications/networking/onionshare/default.nix b/nixpkgs/pkgs/applications/networking/onionshare/default.nix index 017dcf3c9156..9b184a8fa13d 100644 --- a/nixpkgs/pkgs/applications/networking/onionshare/default.nix +++ b/nixpkgs/pkgs/applications/networking/onionshare/default.nix @@ -59,7 +59,6 @@ let license = licenses.gpl3Plus; maintainers = with maintainers; [ bbjubjub ]; - mainProgram = "onionshare-cli"; }; # TODO: package meek https://support.torproject.org/glossary/meek/ @@ -69,7 +68,7 @@ in rec { onionshare = buildPythonApplication { pname = "onionshare-cli"; - inherit version meta; + inherit version; src = "${src}/cli"; patches = [ # hardcode store paths of dependencies @@ -122,11 +121,15 @@ rec { # to fake "test_receive_mode_webhook" ]; + + meta = meta // { + mainProgram = "onionshare-cli"; + }; }; onionshare-gui = buildPythonApplication { pname = "onionshare"; - inherit version meta; + inherit version; src = "${src}/desktop"; patches = [ # hardcode store paths of dependencies @@ -155,12 +158,18 @@ rec { cp $src/org.onionshare.OnionShare.appdata.xml $out/share/appdata ''; + dontWrapQtApps = true; + preFixup = '' - wrapQtApp $out/bin/onionshare + makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; doCheck = false; pythonImportsCheck = [ "onionshare" ]; + + meta = meta // { + mainProgram = "onionshare"; + }; }; } |