Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

p4v: Fix dbus error #322464

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

p4v: Fix dbus error #322464

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions pkgs/applications/version-management/p4v/linux.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{ stdenv
{ lib
, stdenv
, autoPatchelfHook
, cups
, dbus
Expand All @@ -16,6 +17,7 @@
, libinput
, libxcb
, libxkbcommon
, makeWrapper
, nss
, qttools
, qtwebengine
Expand Down Expand Up @@ -73,14 +75,23 @@ in
stdenv.mkDerivation {
inherit pname version;

nativeBuildInputs = [
makeWrapper
];

inherit unwrapped;

# Build a "clean" version of the package so that we don't add extra ".bin" or
# configuration files to users' PATHs. We can't easily put the unwrapped
# package files in libexec (where they belong, probably) because the upstream
# wrapper scripts have the bin directory hardcoded.
buildCommand = ''
mkdir -p $out/bin
for f in p4admin p4merge p4v p4vc; do
ln -s ${unwrapped}/bin/$f $out/bin
# Qt has trouble finding libdbus-1 dynamically, so we provide a wrapper.
# When resolved, this could be reduced to a symlink again.
makeWrapper $unwrapped/bin/$f $out/bin/$f \
--prefix LD_LIBRARY_PATH : "${lib.getLib dbus}/lib"
done
'';
preferLocalBuild = true;
Expand Down