Skip to content

plasma-workspace: fix path to qdbus#117324

Merged
peterhoeg merged 1 commit intoNixOS:masterfrom
peterhoeg:f/plasma_qdbus
Mar 23, 2021
Merged

plasma-workspace: fix path to qdbus#117324
peterhoeg merged 1 commit intoNixOS:masterfrom
peterhoeg:f/plasma_qdbus

Conversation

@peterhoeg
Copy link
Member

@peterhoeg peterhoeg commented Mar 23, 2021

Motivation for this change

This is the "proper(tm)" fix for the broken paths that #117102 handles.

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

@peterhoeg peterhoeg requested a review from ttuegel as a code owner March 23, 2021 07:09
@github-actions github-actions bot added the 6.topic: qt/kde Object-oriented framework for GUI creation label Mar 23, 2021
@peterhoeg
Copy link
Member Author

peterhoeg commented Mar 23, 2021

Cc @worldofpeace @samueldr

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Mar 23, 2021
@r-rmcgibbo
Copy link

r-rmcgibbo commented Mar 23, 2021 •
edited
Loading

Result of nixpkgs-review pr 117324 at f9fa63a8 run on aarch64-linux 1

30 packages marked as broken and skipped:
  • libsForQt512.kde-cli-tools
  • libsForQt512.kdeplasma-addons
  • libsForQt512.khotkeys
  • libsForQt512.kinfocenter
  • libsForQt512.kmenuedit
  • libsForQt512.krohnkite
  • libsForQt512.kwin-dynamic-workspaces
  • libsForQt512.kwin-tiling
  • libsForQt512.parachute
  • libsForQt512.plasma-browser-integration
  • ...
3 packages skipped due to time constraints:
  • kdev-php
  • kdev-python
  • kdevelop-unwrapped
16 packages built successfully:
  • libsForQt5.kde-cli-tools (libsForQt515.kde-cli-tools ,plasma5Packages.kde-cli-tools)
  • libsForQt5.kdeplasma-addons (libsForQt515.kdeplasma-addons ,plasma5Packages.kdeplasma-addons)
  • libsForQt5.khotkeys (libsForQt515.khotkeys ,plasma5Packages.khotkeys)
  • libsForQt5.kinfocenter (libsForQt515.kinfocenter ,plasma5Packages.kinfocenter)
  • libsForQt5.kmenuedit (libsForQt515.kmenuedit ,plasma5Packages.kmenuedit)
  • libsForQt5.krohnkite (libsForQt515.krohnkite ,plasma5Packages.krohnkite)
  • libsForQt5.kwin-dynamic-workspaces (libsForQt515.kwin-dynamic-workspaces ,plasma5Packages.kwin-dynamic-workspaces)
  • libsForQt5.kwin-tiling (libsForQt515.kwin-tiling ,plasma5Packages.kwin-tiling)
  • libsForQt5.parachute (libsForQt515.parachute ,plasma5Packages.parachute)
  • libsForQt5.plasma-browser-integration (libsForQt515.plasma-browser-integration ,plasma5Packages.plasma-browser-integration)
  • libsForQt5.plasma-desktop (libsForQt515.plasma-desktop ,plasma5Packages.plasma-desktop)
  • libsForQt5.plasma-disks (libsForQt515.plasma-disks ,plasma5Packages.plasma-disks)
  • libsForQt5.plasma-workspace (libsForQt515.plasma-workspace ,plasma5Packages.plasma-workspace)
  • libsForQt5.powerdevil (libsForQt515.powerdevil ,plasma5Packages.powerdevil)
  • libsForQt5.systemsettings (libsForQt515.systemsettings ,plasma5Packages.systemsettings)
  • wacomtablet

Result of nixpkgs-review pr 117324 at f9fa63a8 run on x86_64-linux 1

30 packages marked as broken and skipped:
  • libsForQt512.kde-cli-tools
  • libsForQt512.kdeplasma-addons
  • libsForQt512.khotkeys
  • libsForQt512.kinfocenter
  • libsForQt512.kmenuedit
  • libsForQt512.krohnkite
  • libsForQt512.kwin-dynamic-workspaces
  • libsForQt512.kwin-tiling
  • libsForQt512.parachute
  • libsForQt512.plasma-browser-integration
  • ...
7 packages skipped due to time constraints:
  • kdev-php
  • kdev-python
  • kdevelop
  • kdevelop-unwrapped
  • libsForQt5.kdeplasma-addons (libsForQt515.kdeplasma-addons ,plasma5Packages.kdeplasma-addons)
  • libsForQt5.kinfocenter (libsForQt515.kinfocenter ,plasma5Packages.kinfocenter)
  • libsForQt5.plasma-desktop (libsForQt515.plasma-desktop ,plasma5Packages.plasma-desktop)
13 packages built successfully:
  • libsForQt5.kde-cli-tools (libsForQt515.kde-cli-tools ,plasma5Packages.kde-cli-tools)
  • libsForQt5.khotkeys (libsForQt515.khotkeys ,plasma5Packages.khotkeys)
  • libsForQt5.kmenuedit (libsForQt515.kmenuedit ,plasma5Packages.kmenuedit)
  • libsForQt5.krohnkite (libsForQt515.krohnkite ,plasma5Packages.krohnkite)
  • libsForQt5.kwin-dynamic-workspaces (libsForQt515.kwin-dynamic-workspaces ,plasma5Packages.kwin-dynamic-workspaces)
  • libsForQt5.kwin-tiling (libsForQt515.kwin-tiling ,plasma5Packages.kwin-tiling)
  • libsForQt5.parachute (libsForQt515.parachute ,plasma5Packages.parachute)
  • libsForQt5.plasma-browser-integration (libsForQt515.plasma-browser-integration ,plasma5Packages.plasma-browser-integration)
  • libsForQt5.plasma-disks (libsForQt515.plasma-disks ,plasma5Packages.plasma-disks)
  • libsForQt5.plasma-workspace (libsForQt515.plasma-workspace ,plasma5Packages.plasma-workspace)
  • libsForQt5.powerdevil (libsForQt515.powerdevil ,plasma5Packages.powerdevil)
  • libsForQt5.systemsettings (libsForQt515.systemsettings ,plasma5Packages.systemsettings)
  • wacomtablet

ttuegel
ttuegel reviewed Mar 23, 2021
View reviewed changes
pkgs/desktops/plasma-5/plasma-workspace/default.nix Outdated
Copy link
Member

@ttuegel ttuegel Mar 23, 2021

Choose a reason for hiding this comment

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

Why replace the binaries directory with the path to the qdbus file?

Copy link
Member Author

@peterhoeg peterhoeg Mar 23, 2021

Choose a reason for hiding this comment

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

Because I manually redid something that was otherwise tested in a different commit. Fixed.

@peterhoeg peterhoeg merged commit cce199a into NixOS:master Mar 23, 2021
@peterhoeg peterhoeg deleted the f/plasma_qdbus branch March 23, 2021 23:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ttuegel ttuegel ttuegel approved these changes

Assignees

No one assigned

Labels

6.topic: qt/kde Object-oriented framework for GUI creation 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@peterhoeg @r-rmcgibbo @ttuegel