Unverified Commit bc32400f authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

swaylock,swaybg: fix svg support (#378270)

parents edebe663 71ce1c34

nixos/tests/sway.nix

+3 −3
Original line number Diff line number Diff line
@@ -192,15 +192,15 @@ import ./make-test-python.nix ( 
        machine.screenshot("sway_exit")



        swaymsg("exec swaylock")

        machine.wait_until_succeeds("pgrep -x swaylock")

        machine.wait_until_succeeds("pgrep -xf swaylock")

        machine.sleep(3)

        machine.send_chars("${nodes.machine.config.users.users.alice.password}")

        machine.send_key("ret")

        machine.wait_until_fails("pgrep -x swaylock")

        machine.wait_until_fails("pgrep -xf swaylock")



        # Exit Sway and verify process exit status 0:

        swaymsg("exit", succeed=False)

        machine.wait_until_fails("pgrep -x sway")

        machine.wait_until_fails("pgrep -xf sway")

        machine.wait_for_file("/tmp/sway-exit-ok")

      '';

  }

nixos/tests/swayfx.nix

+3 −3
Original line number Diff line number Diff line
@@ -190,15 +190,15 @@ import ./make-test-python.nix ( 
        machine.screenshot("sway_exit")



        swaymsg("exec swaylock")

        machine.wait_until_succeeds("pgrep -x swaylock")

        machine.wait_until_succeeds("pgrep -xf swaylock")

        machine.sleep(3)

        machine.send_chars("${nodes.machine.users.users.alice.password}")

        machine.send_key("ret")

        machine.wait_until_fails("pgrep -x swaylock")

        machine.wait_until_fails("pgrep -xf swaylock")



        # Exit Sway and verify process exit status 0:

        swaymsg("exit", succeed=False)

        machine.wait_until_fails("pgrep -x sway")

        machine.wait_until_fails("pgrep -xf sway")

        machine.wait_for_file("/tmp/sway-exit-ok")

      '';

  }

pkgs/by-name/sw/swaybg/package.nix

+34 −8
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub

, meson, ninja, pkg-config, scdoc

, wayland, wayland-protocols, cairo, gdk-pixbuf

, wayland-scanner

{

  lib,

  stdenv,

  fetchFromGitHub,

  meson,

  ninja,

  pkg-config,

  scdoc,

  wayland,

  wayland-protocols,

  cairo,

  gdk-pixbuf,

  wayland-scanner,

  wrapGAppsNoGuiHook,

  librsvg

}:



stdenv.mkDerivation rec {
@@ -11,17 +22,32 @@ stdenv.mkDerivation rec { 
  src = fetchFromGitHub {

    owner = "swaywm";

    repo = "swaybg";

    rev = "v${version}";

    tag = "v${version}";

    hash = "sha256-IJcPSBJErf8Dy9YhYAc9eg/llgaaLZCQSB0Brof+kpg=";

  };



  strictDeps = true;

  depsBuildBuild = [ pkg-config ];

  nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ];

  buildInputs = [ wayland wayland-protocols cairo gdk-pixbuf ];

  nativeBuildInputs = [

    meson

    ninja

    pkg-config

    scdoc

    wayland-scanner

    wrapGAppsNoGuiHook

    gdk-pixbuf

  ];

  buildInputs = [

    wayland

    wayland-protocols

    cairo

    gdk-pixbuf

    librsvg

  ];



  mesonFlags = [

    "-Dgdk-pixbuf=enabled" "-Dman-pages=enabled"

    "-Dgdk-pixbuf=enabled"

    "-Dman-pages=enabled"

  ];



  meta = with lib; {

pkgs/by-name/sw/swaylock/package.nix

+39 −7
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub

, meson, ninja, pkg-config, scdoc, wayland-scanner

, wayland, wayland-protocols, libxkbcommon, cairo, gdk-pixbuf, pam

{

  lib,

  stdenv,

  fetchFromGitHub,

  meson,

  ninja,

  pkg-config,

  scdoc,

  wayland-scanner,

  wayland,

  wayland-protocols,

  libxkbcommon,

  cairo,

  gdk-pixbuf,

  pam,

  wrapGAppsNoGuiHook,

  librsvg

}:



stdenv.mkDerivation rec {
@@ -10,17 +24,35 @@ stdenv.mkDerivation rec { 
  src = fetchFromGitHub {

    owner = "swaywm";

    repo = "swaylock";

    rev = "v${version}";

    tag = "v${version}";

    hash = "sha256-1+AXxw1gH0SKAxUa0JIhSzMbSmsfmBPCBY5IKaYtldg=";

  };



  strictDeps = true;

  depsBuildBuild = [ pkg-config ];

  nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ];

  buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ];

  nativeBuildInputs = [

    meson

    ninja

    pkg-config

    scdoc

    wayland-scanner

    wrapGAppsNoGuiHook

    gdk-pixbuf

  ];

  buildInputs = [

    wayland

    wayland-protocols

    libxkbcommon

    cairo

    gdk-pixbuf

    pam

    librsvg

  ];



  mesonFlags = [

    "-Dpam=enabled" "-Dgdk-pixbuf=enabled" "-Dman-pages=enabled"

    "-Dpam=enabled"

    "-Dgdk-pixbuf=enabled"

    "-Dman-pages=enabled"

  ];



  meta = with lib; {