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: ff343f110649
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2cb819c0d68e
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 11, 2020

  1. plasma-workspace: remove dependency on qtbase.dev 

    (cherry picked from commit 3bdf448)
    @ttuegel
    ttuegel committed Sep 11, 2020
    Copy the full SHA
    b2f6053 View commit details

  2. Merge pull request #97786 from ttuegel/release-20.09--97669 

    plasma-workspace: fix path to qdbus
    @worldofpeace
    worldofpeace authored Sep 11, 2020
    Copy the full SHA
    2cb819c View commit details
Showing with 5 additions and 0 deletions.
  1. +5 −0 pkgs/desktops/plasma-5/plasma-workspace/default.nix
5 changes: 5 additions & 0 deletions pkgs/desktops/plasma-5/plasma-workspace/default.nix
View file
Original file line number Diff line number Diff line change
@@ -48,6 +48,11 @@ mkDerivation {
./0002-absolute-wallpaper-install-dir.patch
];

postPatch = ''
substituteInPlace wallpapers/image/wallpaper.knsrc.cmake \
--replace '@QtBinariesDir@/qdbus' ${getBin qttools}/bin/qdbus
'';

NIX_CFLAGS_COMPILE = [
''-DNIXPKGS_XMESSAGE="${getBin xmessage}/bin/xmessage"''
''-DNIXPKGS_XRDB="${getBin xrdb}/bin/xrdb"''