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: 1eaf05fbaf6a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 55ac5df24253
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 4, 2020

  1. kwin: fixup build by upstream patch

    @vcunat
    vcunat committed Nov 4, 2020
    Copy the full SHA
    55ac5df View commit details
Showing with 6 additions and 1 deletion.
  1. +6 −1 pkgs/desktops/plasma-5/kwin/default.nix
7 changes: 6 additions & 1 deletion pkgs/desktops/plasma-5/kwin/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
mkDerivation, lib,
mkDerivation, lib, fetchpatch,
extra-cmake-modules, kdoctools,

epoxy,libICE, libSM, libinput, libxkbcommon, udev, wayland, xcb-util-cursor,
@@ -37,6 +37,11 @@ mkDerivation {
patches = [
./0001-follow-symlinks.patch
./0002-xwayland.patch
(fetchpatch { # included in >= 5.18.6
name = "EGL_TEXTURE_Y_XUXV_WL.diff";
url = "https://github.com/KDE/kwin/commit/2c76cc478.diff";
sha256 = "1ywaky05h5j1x758q3yhp3ap45ispffghyxynqz5lybl5n6yyxhy";
})
];
CXXFLAGS = [
''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"''