diff --git a/archlinux/PKGBUILD.in b/archlinux/PKGBUILD.in index 0a0ab3d28..f55a733ba 100644 --- a/archlinux/PKGBUILD.in +++ b/archlinux/PKGBUILD.in @@ -1,6 +1,6 @@ # Maintainer: Frédéric Pierret (fepitre) -pkgname=(qubes-vm-core qubes-vm-networking qubes-vm-keyring qubes-vm-passwordless-root qubes-vm-dom0-updates) +pkgname=(qubes-vm-core qubes-vm-networking qubes-vm-keyring qubes-vm-nautilus qubes-vm-passwordless-root qubes-vm-dom0-updates) pkgver=@VERSION@ pkgrel=@REL@ pkgdesc="The Qubes core files for installation inside a Qubes VM." @@ -89,8 +89,8 @@ package_qubes-vm-core() { gnome-settings-daemon gpk-update-viewer python-caja - python-nautilus qubes-vm-keyring + qubes-vm-nautilus qubes-vm-networking ) install="archlinux/PKGBUILD.install" @@ -105,7 +105,6 @@ package_qubes-vm-core() { make -C qubes-rpc DESTDIR="$pkgdir" install make -C qubes-rpc/caja DESTDIR="$pkgdir" install make -C qubes-rpc/kde DESTDIR="$pkgdir" install - make -C qubes-rpc/nautilus DESTDIR="$pkgdir" install make -C qubes-rpc/thunar DESTDIR="$pkgdir" install make -C filesystem DESTDIR="$pkgdir" install @@ -207,6 +206,28 @@ package_qubes-vm-keyring() { install -m0644 "archlinux/PKGBUILD-keyring-revoked" "${pkgdir}/usr/share/pacman/keyrings/qubesos-vm-revoked" } +package_qubes-vm-nautilus() { + pkgdesc="Qubes OS Nautilus addons for inter-VM file copy/move/open" + conflicts=('qubes-vm-core<4.3.26') + depends=( + bash + python-gobject + python-nautilus + qubes-vm-core + qubes-vm-qrexec + ) + + cd "${_pkgnvr}" + make -C qubes-rpc/nautilus install \ + DESTDIR="$pkgdir" \ + SBINDIR=/usr/bin \ + LIBDIR=/usr/lib \ + SYSLIBDIR=/usr/lib \ + SYSTEM_DROPIN_DIR=/usr/lib/systemd/system \ + USER_DROPIN_DIR=/usr/lib/systemd/user \ + DIST=archlinux +} + package_qubes-vm-passwordless-root() { pkgdesc="Qubes OS Passwordless root access from normal user" diff --git a/qubes-rpc/nautilus/Makefile b/qubes-rpc/nautilus/Makefile index 33071bef2..dd6212b20 100644 --- a/qubes-rpc/nautilus/Makefile +++ b/qubes-rpc/nautilus/Makefile @@ -6,4 +6,5 @@ QUBESLIBDIR ?= /usr/lib/qubes install: install -d $(DESTDIR)$(NAUTILUSPYEXTDIR) install -t $(DESTDIR)$(NAUTILUSPYEXTDIR) -m 0644 *.py + install -d $(DESTDIR)$(QUBESLIBDIR) install -t $(DESTDIR)$(QUBESLIBDIR) -m 0755 *.sh