Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 22160302cf43
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 680e9f1d9128
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 7, 2019

  1. xorg.editres: fix build (#56979)

    @knedlsepp @xeji
    knedlsepp authored and xeji committed Mar 7, 2019
    Copy the full SHA
    680e9f1 View commit details
Showing with 4 additions and 0 deletions.
  1. +4 −0 pkgs/servers/x11/xorg/overrides.nix
4 changes: 4 additions & 0 deletions pkgs/servers/x11/xorg/overrides.nix
View file
Original file line number Diff line number Diff line change
@@ -42,6 +42,10 @@ self: super:
buildInputs = attrs.buildInputs ++ [ self.mkfontscale ];
});

editres = super.editres.overrideAttrs (attrs: {
hardeningDisable = [ "format" ];
});

fontbhttf = super.fontbhttf.overrideAttrs (attrs: {
meta = attrs.meta // { license = lib.licenses.unfreeRedistributable; };
});