From da5f8ac977b86bb5e12e3d98af6cf3c2337d524b Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 26 Jun 2021 18:23:20 +0200 Subject: [PATCH] wlroots_0_13: drop We've now updated or patched all packages to use wlroots 0.14 (except phoc which still depends on wlroots 0.12). --- pkgs/development/libraries/wlroots/0.13.nix | 55 --------------------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 56 deletions(-) delete mode 100644 pkgs/development/libraries/wlroots/0.13.nix diff --git a/pkgs/development/libraries/wlroots/0.13.nix b/pkgs/development/libraries/wlroots/0.13.nix deleted file mode 100644 index f2343e73c589..000000000000 --- a/pkgs/development/libraries/wlroots/0.13.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland-scanner -, libGL, wayland, wayland-protocols, libinput, libxkbcommon, pixman -, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa -, libpng, ffmpeg, libuuid, xcbutilrenderutil, xwayland -}: - -stdenv.mkDerivation rec { - pname = "wlroots"; - version = "0.13.0"; - - src = fetchFromGitHub { - owner = "swaywm"; - repo = "wlroots"; - rev = version; - sha256 = "01plhbnsp5yg18arz0v8fr0pr9l4w4pdzwkg9px486qdvb3s1vgy"; - }; - - # $out for the library and $examples for the example programs (in examples): - outputs = [ "out" "examples" ]; - - nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ]; - - buildInputs = [ - libGL wayland wayland-protocols libinput libxkbcommon pixman - xcbutilwm libX11 libcap xcbutilimage xcbutilerrors mesa - libpng ffmpeg libuuid xcbutilrenderutil xwayland - ]; - - mesonFlags = [ "-Dlogind-provider=systemd" "-Dlibseat=disabled" ]; - - postFixup = '' - # Install ALL example programs to $examples: - # screencopy dmabuf-capture input-inhibitor layer-shell idle-inhibit idle - # screenshot output-layout multi-pointer rotation tablet touch pointer - # simple - mkdir -p $examples/bin - cd ./examples - for binary in $(find . -executable -type f -printf '%P\n' | grep -vE '\.so'); do - cp "$binary" "$examples/bin/wlroots-$binary" - done - ''; - - meta = with lib; { - description = "A modular Wayland compositor library"; - longDescription = '' - Pluggable, composable, unopinionated modules for building a Wayland - compositor; or about 50,000 lines of code you were going to write anyway. - ''; - inherit (src.meta) homepage; - changelog = "https://github.com/swaywm/wlroots/releases/tag/${version}"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ primeos synthetica ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6705c5b90e07..438075f7f14a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24575,7 +24575,6 @@ in }; wlroots_0_12 = callPackage ../development/libraries/wlroots/0.12.nix {}; - wlroots_0_13 = callPackage ../development/libraries/wlroots/0.13.nix {}; sway-unwrapped = callPackage ../applications/window-managers/sway { }; sway = callPackage ../applications/window-managers/sway/wrapper.nix { };