Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

citrix_workspace: add more features, refactor derivation #90692

Merged
merged 3 commits into from Jul 17, 2020

Conversation

Ma27
Copy link
Member

@Ma27 Ma27 commented Jun 17, 2020

Motivation for this change

In #89806 it has been reported that the final package is missing a lot
of features like support for the self-service GUI and the
config-management.

While working on supporting those components in the Nix-package, I
decided to refactor the package to simplify the entire setup.

This patch changes the following things:

  • Binaries and libraries are patched using the autoPatchelfHook to
    avoid having unneeded libraries linked (e.g. some programs use gtk2,
    others use gtk3).

  • Moved source-declarations into their own file.

  • Wrapped configmgr and selfservice and added those to $out/bin.

  • Don't mention the old citrix_receiver-packages in the manual anymore
    since those packages were removed in 19.09 and are EOLed anyways.

Closes #89806

cc @cebaa would you mind testing the selfservice-feature? I don't have a proper environment to test, unfortunately.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • 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"
  • 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.

@Ma27
Copy link
Member Author

Ma27 commented Jul 14, 2020

@cebaa can you please take a final look?
@jtojnar in case you have time to, could you check if the changes look ok?

Ma27 added 3 commits July 15, 2020 19:10
In NixOS#89806 it has been reported that the final package is missing a lot
of features like support for the self-service GUI and the
config-management.

While working on supporting those components in the Nix-package, I
decided to refactor the package to simplify the entire setup.

This patch changes the following things:

* Binaries and libraries are patched using the `autoPatchelfHook` to
  avoid having unneeded libraries linked (e.g. some programs use gtk2,
  others use gtk3).

* Moved source-declarations into their own file.

* Wrapped `configmgr` and `selfservice` and added those to `$out/bin`.

* Don't mention the old `citrix_receiver`-packages in the manual anymore
  since those packages were removed in 19.09 and are EOLed anyways.

Closes NixOS#89806
@Ma27 Ma27 merged commit 98d2458 into NixOS:master Jul 17, 2020
@Ma27 Ma27 deleted the citrix-workspace branch July 17, 2020 14:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

citrix_workspace issues
2 participants