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

gnome3.dconf: fix build on Darwin #55800

Merged
merged 1 commit into from Feb 16, 2019

Conversation

kalbasit
Copy link
Member

Motivation for this change

Fix the build on Darwin.

Please see https://gitlab.gnome.org/GNOME/dconf/issues/47

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@GrahamcOfBorg GrahamcOfBorg added 6.topic: darwin Running or building packages on Darwin 6.topic: GNOME GNOME desktop environment and its underlying platform labels Feb 15, 2019
@kalbasit kalbasit changed the base branch from master to staging February 15, 2019 06:52
@kalbasit
Copy link
Member Author

I rebased and switched the base over to staging.

Copy link
Member

@matthewbauer matthewbauer left a comment

Choose a reason for hiding this comment

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

Looks good! If you want to avoid waiting for staging, this could go directly to master if you make it conditional on stdenv.isDarwin

@kalbasit
Copy link
Member Author

kalbasit commented Feb 15, 2019

@matthewbauer do we officially support BSD systems? This affects them too AFAIK from the linked issue. Otherwise, I'll gate it to Darwin and switch the base back to master.

@hedning
Copy link
Contributor

hedning commented Feb 15, 2019

I don't think gating the patch will work in this case. Having patches = null changes the hash, it's not the same as not having patches at all unfortunately (might be some way around this?).

@kalbasit
Copy link
Member Author

kalbasit commented Feb 16, 2019

@hedning Good point! Perhaps I can do an if with attrs merge

stdenv.mkDerivation (rec {
} // optionalAttrs stdenv.isDarwin { patches = [ ... ]; })

@hedning
Copy link
Contributor

hedning commented Feb 16, 2019

Hehe, there's always a way :) Though I'm not sure if it's really worth it tbh.

@kalbasit
Copy link
Member Author

I prefer merging as is to staging obviously. I'll sync up with you on #nixos-dev to see when I can merge it here.

@hedning
Copy link
Contributor

hedning commented Feb 16, 2019

I don't see any problem with merging to staging, this isn't really a time sensitive patch anyway (polari/freenode is bugging out for me and only lets me connect to #nixos atm).

@kalbasit kalbasit merged commit a0eb6c1 into NixOS:staging Feb 16, 2019
@kalbasit kalbasit deleted the nixpkgs_update-dconf branch February 16, 2019 01:30
@matthewbauer
Copy link
Member

matthewbauer commented Feb 16, 2019 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: darwin Running or building packages on Darwin 6.topic: GNOME GNOME desktop environment and its underlying platform 10.rebuild-darwin: 11-100 10.rebuild-linux: 501+ 10.rebuild-linux: 2501-5000
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants