diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-03-10 08:04:21 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-03-10 08:04:21 +0100 |
| commit | bf47162c26641af76083b0d26ceb477be6a620ff (patch) | |
| tree | 6aac7576850659e3c0e880036bcbeed56a70662b /pkgs/servers/x11 | |
| parent | 5d7ab319493974dbd8514d99941e6aa1108cc05f (diff) | |
| parent | 213d6dd6ac1e440e95398448dae4bd6cf24989dd (diff) | |
| download | nixlib-bf47162c26641af76083b0d26ceb477be6a620ff.tar nixlib-bf47162c26641af76083b0d26ceb477be6a620ff.tar.gz nixlib-bf47162c26641af76083b0d26ceb477be6a620ff.tar.bz2 nixlib-bf47162c26641af76083b0d26ceb477be6a620ff.tar.lz nixlib-bf47162c26641af76083b0d26ceb477be6a620ff.tar.xz nixlib-bf47162c26641af76083b0d26ceb477be6a620ff.tar.zst nixlib-bf47162c26641af76083b0d26ceb477be6a620ff.zip | |
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1508887
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index d62d61b429ec..886de897db83 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -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; }; }); @@ -285,6 +289,10 @@ self: super: meta = attrs.meta // { platforms = stdenv.lib.platforms.linux; }; }); + oclock = super.oclock.overrideAttrs (attrs: { + buildInputs = attrs.buildInputs ++ [ self.libxkbfile ]; + }); + setxkbmap = super.setxkbmap.overrideAttrs (attrs: { postInstall = '' |