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

open-vm-tools: fix build #90626

Merged

Conversation

tteggel
Copy link
Contributor

@tteggel tteggel commented Jun 16, 2020

Motivation for this change

Fixes #90544

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.

@@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
repo = "open-vm-tools";
rev = "stable-${version}";
sha256 = "0idh8dqwb1df2di689090k9x1iap35jk3wg8yb1g70byichmscqb";
name = "${pname}-${version}-source";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
name = "${pname}-${version}-source";

the default name is intentional c3255fe

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My bad I put this in because I screwed up a fetch and needed to force my local env to redo it. Removed.


patches = [ ./recognize_nixos.patch ];
patches = [ ./recognize_nixos.patch ./find_gdk_pixbuf_xlib.patch ];
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can reference your upstream patch vmware/open-vm-tools#438 in a comment?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@tteggel tteggel force-pushed the fix-open-vm-tools-gdk-pixbuf-xlib branch from cee9131 to 071d042 Compare June 18, 2020 11:23
@worldofpeace
Copy link
Contributor

worldofpeace commented Jun 18, 2020

Can you reword your commit header to match contribution guidelines? Like

open-vm-tools: fix build

https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md#submitting-changes

@tteggel tteggel force-pushed the fix-open-vm-tools-gdk-pixbuf-xlib branch from 071d042 to 94e7fdf Compare June 18, 2020 12:19
@tteggel
Copy link
Contributor Author

tteggel commented Jun 18, 2020

Commit message fixed @worldofpeace. Thanks for bearing with me.

@worldofpeace worldofpeace changed the title Fixes open-vm-tools build open-vm-tools: fix build Jun 18, 2020
@worldofpeace worldofpeace merged commit af729e9 into NixOS:master Jun 18, 2020
@worldofpeace
Copy link
Contributor

@tteggel No problem. Thanks for contributing ✨

@tteggel tteggel deleted the fix-open-vm-tools-gdk-pixbuf-xlib branch June 19, 2020 12:32
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.

Open-vm-tools fails to install due to missing gdk-pixbuf-xlib-2.0
3 participants