mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-06 04:27:27 +03:00
Merge pull request #324179 from jchw-forks/xpra/fix-xdg-open
xpra: fix xdg-open path
This commit is contained in:
commit
f0d8cd8702
@ -29,11 +29,13 @@
|
||||
, pango
|
||||
, pulseaudio
|
||||
, python3
|
||||
, stdenv
|
||||
, util-linux
|
||||
, which
|
||||
, x264
|
||||
, x265
|
||||
, xauth
|
||||
, xdg-utils
|
||||
, xorg
|
||||
, xorgserver
|
||||
}:
|
||||
@ -84,6 +86,12 @@ in buildPythonApplication rec {
|
||||
./fix-122159.patch # https://github.com/NixOS/nixpkgs/issues/122159
|
||||
];
|
||||
|
||||
# Note: xposix is renamed to posix in v5.
|
||||
postPatch = lib.optionalString stdenv.isLinux ''
|
||||
substituteInPlace xpra/platform/xposix/features.py \
|
||||
--replace-fail "/usr/bin/xdg-open" "${xdg-utils}/bin/xdg-open"
|
||||
'';
|
||||
|
||||
INCLUDE_DIRS = "${pam}/include";
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
Loading…
Reference in New Issue
Block a user