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: 27accf380b48
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3ff9f5ccd4be
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 20, 2020

  1. xss-lock: use fork with session param support 

    xss-lock uses current session that cannot be overriden. This prevents starting
xss-lock as systemd user service, as described here:
https://bitbucket.org/raymonad/xss-lock/issues/13/allow-operation-as-systemd-user-unit

This change uses source from github.com/xdbob/xss-lock that adds `--session`
parameter.
    @offlinehacker
    offlinehacker committed Jan 20, 2020
    Copy the full SHA
    d0a3a80 View commit details

Commits on Jan 23, 2020

  1. Merge pull request #78059 from xtruder/pkgs/xss-lock/session-param 

    xss-lock: add patch to allow setting session
    @offlinehacker
    offlinehacker authored Jan 23, 2020
    Copy the full SHA
    3ff9f5c View commit details
Showing with 8 additions and 7 deletions.
  1. +8 −7 pkgs/misc/screensavers/xss-lock/default.nix
15 changes: 8 additions & 7 deletions pkgs/misc/screensavers/xss-lock/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
{ stdenv, fetchgit, cmake, docutils, pkgconfig, glib, libpthreadstubs
{ stdenv, fetchFromGitHub, cmake, docutils, pkgconfig, glib, libpthreadstubs
, libXau, libXdmcp, xcbutil }:

stdenv.mkDerivation {
name = "xss-lock-git-2014-03-02";
name = "xss-lock-git-2018-05-31";

src = fetchgit {
url = https://bitbucket.org/raymonad/xss-lock.git;
rev = "1e158fb20108058dbd62bd51d8e8c003c0a48717";
sha256 = "10hx7k7ga8g08akwz8qrsvj8iqr5nd4siiva6sjx789jvf0sak7r";
src = fetchFromGitHub {
owner = "xdbob";
repo = "xss-lock";
rev = "cd0b89df9bac1880ea6ea830251c6b4492d505a5";
sha256 = "040nqgfh564frvqkrkmak3x3h0yadz6kzk81jkfvd9vd20a9drh7";
};

nativeBuildInputs = [ pkgconfig ];
@@ -17,7 +18,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "Use external locker (such as i3lock) as X screen saver";
license = licenses.mit;
maintainers = with maintainers; [ malyn ];
maintainers = with maintainers; [ malyn offline ];
platforms = platforms.linux;
};
}