diff --git a/pkgs/default.nix b/pkgs/default.nix index b01fc984..3d41e4a6 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -20,7 +20,6 @@ lib.makeScope newScope (self: { mopidy-funkwhale = callPackage ./mopidy-funkwhale.nix { }; mopidy-internetarchive = callPackage ./mopidy-internetarchive.nix { }; nautilus-annotations = callPackage ./nautilus-annotations { }; - niri = callPackage ./niri { }; pop-launcher-plugin-brightness = callPackage ./pop-launcher-plugin-brightness { }; pop-launcher-plugin-duckduckgo-bangs = callPackage ./pop-launcher-plugin-duckduckgo-bangs.nix { }; diff --git a/pkgs/niri/default.nix b/pkgs/niri/default.nix deleted file mode 100644 index e0f9fdba..00000000 --- a/pkgs/niri/default.nix +++ /dev/null @@ -1,99 +0,0 @@ -{ lib -, fetchFromGitHub -, rustPlatform -, pkg-config -, pipewire -, udev -, glib -, cairo -, pango -, libxkbcommon -, libinput -, libglvnd -, systemd -, wayland -, mesa -, seatd - - # Session script dependencies. -, makeBinaryWrapper -, coreutils -, dbus -}: - -rustPlatform.buildRustPackage rec { - pname = "niri"; - version = "0.1.1"; - - src = fetchFromGitHub { - owner = "YaLTeR"; - repo = pname; - rev = "v${version}"; - hash = "sha256-+Y7dnq8gwVxefwvRnamqGneCTI4uUXgAo0SEffIvNB0="; - }; - - nativeBuildInputs = [ - makeBinaryWrapper - pkg-config - rustPlatform.bindgenHook - ]; - - buildInputs = [ - cairo - glib - libinput - libxkbcommon - libglvnd - mesa - pango - pipewire - seatd - systemd - udev - wayland - ]; - - cargoLock = { - lockFile = "${src}/Cargo.lock"; - outputHashes = { - "smithay-0.3.0" = "sha256-TWq4L7Pe4/s0+hGjvTixoOFQ3P6tJXzV4/VgKcJ0tWU="; - }; - }; - - RUSTFLAGS = builtins.map (arg: "-C link-arg=${arg}") [ - "-Wl,--push-state,--no-as-needed" - "-lEGL" - "-lwayland-client" - "-Wl,--pop-state" - ]; - - postPatch = '' - patchShebangs ./resources/niri-session - substituteInPlace ./resources/niri.service \ - --replace '/usr/bin' "$out/bin" - ''; - - postInstall = '' - install -Dm0755 resources/niri-session -t $out/bin - - # This session script is used as a system component so we may as well fully - # wrap this with nixpkgs' dependencies. - wrapProgram $out/bin/niri-session \ - --prefix PATH ':' '${lib.makeBinPath [ coreutils systemd dbus ]}' - - install -Dm0644 resources/niri.desktop -t $out/share/wayland-sessions - install -Dm0644 resources/niri-portals.conf -t $out/share/xdg-desktop-portal - install -Dm0644 resources/niri{-shutdown.target,.service} -t $out/lib/systemd/user - ''; - - passthru.providedSessions = [ "niri" ]; - - meta = with lib; { - homepage = "https://github.com/YaLTeR/niri"; - description = "Scrollable tiling window manager"; - license = licenses.gpl3Plus; - mainProgram = "niri"; - maintainers = with maintainers; [ foo-dogsquared ]; - platforms = platforms.linux; - }; -}