Skip to content

Commit fe2d642

Browse files
author
3np
committed
arch: break out qubes-vm-nautilus from qubes-vm-core
1 parent dc40e16 commit fe2d642

File tree

2 files changed

+25
-4
lines changed

2 files changed

+25
-4
lines changed

archlinux/PKGBUILD.in

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Maintainer: Frédéric Pierret (fepitre) <frederic@invisiblethingslab.com>
22

3-
pkgname=(qubes-vm-core qubes-vm-networking qubes-vm-keyring qubes-vm-passwordless-root qubes-vm-dom0-updates)
3+
pkgname=(qubes-vm-core qubes-vm-networking qubes-vm-keyring qubes-vm-nautilus qubes-vm-passwordless-root qubes-vm-dom0-updates)
44
pkgver=@VERSION@
55
pkgrel=@REL@
66
pkgdesc="The Qubes core files for installation inside a Qubes VM."
@@ -89,9 +89,9 @@ package_qubes-vm-core() {
8989
gnome-settings-daemon
9090
gpk-update-viewer
9191
python-caja
92-
python-nautilus
93-
qubes-vm-networking
9492
qubes-vm-keyring
93+
qubes-vm-nautilus
94+
qubes-vm-networking
9595
)
9696
install="archlinux/PKGBUILD.install"
9797

@@ -105,7 +105,6 @@ package_qubes-vm-core() {
105105
make -C qubes-rpc DESTDIR="$pkgdir" install
106106
make -C qubes-rpc/caja DESTDIR="$pkgdir" install
107107
make -C qubes-rpc/kde DESTDIR="$pkgdir" install
108-
make -C qubes-rpc/nautilus DESTDIR="$pkgdir" install
109108
make -C qubes-rpc/thunar DESTDIR="$pkgdir" install
110109
make -C filesystem DESTDIR="$pkgdir" install
111110

@@ -207,6 +206,27 @@ package_qubes-vm-keyring() {
207206
install -m0644 "archlinux/PKGBUILD-keyring-revoked" "${pkgdir}/usr/share/pacman/keyrings/qubesos-vm-revoked"
208207
}
209208

209+
package_qubes-vm-nautilus() {
210+
pkgdesc="Qubes OS Nautilus addons for inter-VM file copy/move/open"
211+
arch=("any")
212+
conflicts=('qubes-vm-core<4.3.20')
213+
depends=(
214+
python-nautilus
215+
qubes-vm-core
216+
qubes-vm-qrexec
217+
)
218+
219+
cd "${_pkgnvr}"
220+
make -C qubes-rpc/nautilus install \
221+
DESTDIR="$pkgdir" \
222+
SBINDIR=/usr/bin \
223+
LIBDIR=/usr/lib \
224+
SYSLIBDIR=/usr/lib \
225+
SYSTEM_DROPIN_DIR=/usr/lib/systemd/system \
226+
USER_DROPIN_DIR=/usr/lib/systemd/user \
227+
DIST=archlinux
228+
}
229+
210230
package_qubes-vm-passwordless-root() {
211231
pkgdesc="Qubes OS Passwordless root access from normal user"
212232

qubes-rpc/nautilus/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ QUBESLIBDIR ?= /usr/lib/qubes
66
install:
77
install -d $(DESTDIR)$(NAUTILUSPYEXTDIR)
88
install -t $(DESTDIR)$(NAUTILUSPYEXTDIR) -m 0644 *.py
9+
install -d $(DESTDIR)$(QUBESLIBDIR)
910
install -t $(DESTDIR)$(QUBESLIBDIR) -m 0755 *.sh

0 commit comments

Comments
 (0)