Unverified Commit 3563397b authored by rewine's avatar rewine Committed by GitHub
Browse files

Merge pull request #330630 from wineee/wlroots-0.18 

wlroots_0_18: init at 0.18.0
parents a4b56f99 febcfca9

pkgs/by-name/sc/scenefx/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
  fetchFromGitHub,

  meson,

  ninja,

  wlroots,

  wlroots_0_17,

  scdoc,

  pkg-config,

  wayland,
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { 
    pixman

    wayland

    wayland-protocols

    wlroots

    wlroots_0_17

  ];



  passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;

pkgs/by-name/sw/swayfx-unwrapped/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
  scenefx,

  wayland-scanner,

  xcbutilwm,

  wlroots,

  wlroots_0_17,

  testers,

  nixosTests,

  # Used by the NixOS module:
@@ -99,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: { 
    scenefx

    wayland

    wayland-protocols

    (wlroots.override { inherit (finalAttrs) enableXWayland; })

    (wlroots_0_17.override { inherit (finalAttrs) enableXWayland; })

  ] ++ lib.optionals finalAttrs.enableXWayland [ xcbutilwm ];



  mesonFlags =

pkgs/development/libraries/wlroots/default.nix

+16 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
, glslang

, libliftoff

, libdisplay-info

, lcms2

, nixosTests



, enableXWayland ? true
@@ -137,5 +138,19 @@ rec { 
    ];

  };



  wlroots = wlroots_0_17;

  wlroots_0_18 = generic {

    version = "0.18.0";

    hash = "sha256-LiRnvu7qCbfSg+ONWVCtWwdzxxFZHfbgmy7zApCIW40=";

    extraNativeBuildInputs = [

      hwdata

    ];

    extraBuildInputs = [

      ffmpeg

      libliftoff

      libdisplay-info

      lcms2

    ];

  };



  wlroots = wlroots_0_18;

}

pkgs/top-level/all-packages.nix

+1 −0
Original line number Diff line number Diff line
@@ -31238,6 +31238,7 @@ with pkgs; 
  inherit (callPackages ../development/libraries/wlroots {})

    wlroots_0_16

    wlroots_0_17

    wlroots_0_18

    wlroots;















  sway-contrib = recurseIntoAttrs (callPackages ../applications/misc/sway-contrib { });