Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: de766883f718
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7c23e16b6569
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 19, 2021

  1. swaylock-effects: v1.6-1 -> v1.6-2 

    (cherry picked from commit 327e849)
    @bbigras @Ma27
    bbigras authored and Ma27 committed Apr 19, 2021
    Copy the full SHA
    e3307d2 View commit details

  2. swaylock-effects: 1.6-2 -> 1.6-3 (#119869) 

    * swaylock-effects: 1.6-2 -> 1.6-3

* Apply suggestions from code review

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

Co-authored-by: Yurii Matsiuk <ymatsiuk@users.noreply.github.com>
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
(cherry picked from commit 92f5c75)
    @ymatsiuk @Ma27
    ymatsiuk authored and Ma27 committed Apr 19, 2021
    Copy the full SHA
    7c23e16 View commit details
Showing with 6 additions and 4 deletions.
  1. +6 −4 pkgs/applications/window-managers/sway/lock-effects.nix
10 changes: 6 additions & 4 deletions pkgs/applications/window-managers/sway/lock-effects.nix
View file
Original file line number Diff line number Diff line change
@@ -6,13 +6,13 @@

stdenv.mkDerivation rec {
pname = "swaylock-effects";
version = "v1.6-1";
version = "1.6-3";

src = fetchFromGitHub {
owner = "mortie";
repo = "swaylock-effects";
rev = version;
sha256 = "044fc4makjx8v29fkx5xlil6vr1v4r0k6c8741pl67gzvlm4cx3i";
rev = "v${version}";
sha256 = "sha256-71IX0fC4xCPP6pK63KtvDMb3KoP1rw/Iz3S7BgiLSpg=";
};

postPatch = ''
@@ -23,7 +23,9 @@ stdenv.mkDerivation rec {
buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ];

mesonFlags = [
"-Dpam=enabled" "-Dgdk-pixbuf=enabled" "-Dman-pages=enabled"
"-Dpam=enabled"
"-Dgdk-pixbuf=enabled"
"-Dman-pages=enabled"
];

meta = with stdenv.lib; {