From ad2c6e5e11542e15032c27618ca976d2c0fc1e5f Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 26 Nov 2023 20:24:38 -0300 Subject: xarcan: migrate to by-name --- pkgs/by-name/xa/xarcan/package.nix | 119 +++++++++++++++++++++++++++++++++ pkgs/desktops/arcan/xarcan/default.nix | 119 --------------------------------- 2 files changed, 119 insertions(+), 119 deletions(-) create mode 100644 pkgs/by-name/xa/xarcan/package.nix delete mode 100644 pkgs/desktops/arcan/xarcan/default.nix (limited to 'pkgs') diff --git a/pkgs/by-name/xa/xarcan/package.nix b/pkgs/by-name/xa/xarcan/package.nix new file mode 100644 index 000000000000..b979b64a06c5 --- /dev/null +++ b/pkgs/by-name/xa/xarcan/package.nix @@ -0,0 +1,119 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, arcan +, audit +, dbus +, libepoxy +, fontutil +, libGL +, libX11 +, libXau +, libXdmcp +, libXfont2 +, libdrm +, libgcrypt +, libmd +, libselinux +, libtirpc +, libxcb +, libxkbfile +, libxshmfence +, mesa +, meson +, nettle +, ninja +, openssl +, pixman +, pkg-config +, systemd +, xcbutil +, xcbutilwm +, xkbcomp +, xkeyboard_config +, xorgproto +, xtrans +}: + +stdenv.mkDerivation (finalPackages: { + pname = "xarcan"; + version = "unstable-2022-06-14"; + + src = fetchFromGitHub { + owner = "letoram"; + repo = "xarcan"; + rev = "02111f4925453c0c545e9193c6a5e22c0d4e98c3"; + hash = "sha256-rp2sNRbv0OZdfyqZfsv/v3TGQY5uyXWqbvlmUDd7iBk="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + arcan + audit + dbus + libepoxy + fontutil + libGL + libX11 + libXau + libXdmcp + libXfont2 + libdrm + libgcrypt + libmd + libselinux + libtirpc + libxcb + libxkbfile + libxshmfence + mesa + nettle + openssl + pixman + systemd + xcbutil + xcbutilwm + xkbcomp + xkeyboard_config + xorgproto + xtrans + ]; + + configureFlags = [ + "--disable-int10-module" + "--disable-static" + "--disable-xnest" + "--disable-xorg" + "--disable-xvfb" + "--disable-xwayland" + "--enable-glamor" + "--enable-glx" + "--enable-ipv6" + "--enable-kdrive" + "--enable-record" + "--enable-xarcan" + "--enable-xcsecurity" + "--with-xkb-bin-directory=${xkbcomp}/bin" + "--with-xkb-output=/tmp" + "--with-xkb-path=${xkeyboard_config}/share/X11/xkb" + ]; + + meta = with lib; { + homepage = "https://github.com/letoram/letoram"; + description = "Patched Xserver that bridges connections to Arcan"; + longDescription = '' + xarcan is a patched X server with a KDrive backend that uses the + arcan-shmif to map Xlib/Xcb/X clients to a running arcan instance. It + allows running an X session as a window under Arcan. + ''; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/desktops/arcan/xarcan/default.nix b/pkgs/desktops/arcan/xarcan/default.nix deleted file mode 100644 index b979b64a06c5..000000000000 --- a/pkgs/desktops/arcan/xarcan/default.nix +++ /dev/null @@ -1,119 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, arcan -, audit -, dbus -, libepoxy -, fontutil -, libGL -, libX11 -, libXau -, libXdmcp -, libXfont2 -, libdrm -, libgcrypt -, libmd -, libselinux -, libtirpc -, libxcb -, libxkbfile -, libxshmfence -, mesa -, meson -, nettle -, ninja -, openssl -, pixman -, pkg-config -, systemd -, xcbutil -, xcbutilwm -, xkbcomp -, xkeyboard_config -, xorgproto -, xtrans -}: - -stdenv.mkDerivation (finalPackages: { - pname = "xarcan"; - version = "unstable-2022-06-14"; - - src = fetchFromGitHub { - owner = "letoram"; - repo = "xarcan"; - rev = "02111f4925453c0c545e9193c6a5e22c0d4e98c3"; - hash = "sha256-rp2sNRbv0OZdfyqZfsv/v3TGQY5uyXWqbvlmUDd7iBk="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - ]; - - buildInputs = [ - arcan - audit - dbus - libepoxy - fontutil - libGL - libX11 - libXau - libXdmcp - libXfont2 - libdrm - libgcrypt - libmd - libselinux - libtirpc - libxcb - libxkbfile - libxshmfence - mesa - nettle - openssl - pixman - systemd - xcbutil - xcbutilwm - xkbcomp - xkeyboard_config - xorgproto - xtrans - ]; - - configureFlags = [ - "--disable-int10-module" - "--disable-static" - "--disable-xnest" - "--disable-xorg" - "--disable-xvfb" - "--disable-xwayland" - "--enable-glamor" - "--enable-glx" - "--enable-ipv6" - "--enable-kdrive" - "--enable-record" - "--enable-xarcan" - "--enable-xcsecurity" - "--with-xkb-bin-directory=${xkbcomp}/bin" - "--with-xkb-output=/tmp" - "--with-xkb-path=${xkeyboard_config}/share/X11/xkb" - ]; - - meta = with lib; { - homepage = "https://github.com/letoram/letoram"; - description = "Patched Xserver that bridges connections to Arcan"; - longDescription = '' - xarcan is a patched X server with a KDrive backend that uses the - arcan-shmif to map Xlib/Xcb/X clients to a running arcan instance. It - allows running an X session as a window under Arcan. - ''; - license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; - }; -}) -- cgit 1.4.1