From 1e317150efce2e74ce6714f7ba0fd18562a9a34d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 13 May 2017 14:15:47 +0200 Subject: [PATCH 1/2] i3lock-pixeled: init at 1.1.0 --- .../screensavers/i3lock-pixeled/default.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/misc/screensavers/i3lock-pixeled/default.nix diff --git a/pkgs/misc/screensavers/i3lock-pixeled/default.nix b/pkgs/misc/screensavers/i3lock-pixeled/default.nix new file mode 100644 index 000000000000..735bbb5d4277 --- /dev/null +++ b/pkgs/misc/screensavers/i3lock-pixeled/default.nix @@ -0,0 +1,39 @@ +{ stdenv, pkgs, fetchurl }: + +stdenv.mkDerivation rec { + name = "i3lock-pixeled-${version}"; + version = "1.1.0"; + + src = fetchurl { + url = "https://github.com/Ma27/i3lock-pixeled/archive/${version}.tar.gz"; + sha256 = "046qbx4qvcc66h53h4mm9pyjj9gjc6dzy38a0f0jc5a84xbivh7k"; + }; + + propagatedBuildInputs = with pkgs; [ + i3lock + imagemagick + scrot + playerctl + ]; + + buildPhases = [ "unpackPhase" "patchPhase" "installPhase" ]; + makeFlags = [ + "PREFIX=$(out)/bin" + ]; + + patchPhase = '' + # patch paths + sed -i -e "s#i3lock#${pkgs.i3lock}/bin/i3lock#" i3lock-pixeled + sed -i -e "s#convert#${pkgs.imagemagick}/bin/convert#" i3lock-pixeled + sed -i -e "s#scrot#${pkgs.scrot}/bin/scrot#" i3lock-pixeled + sed -i -e "s#playerctl#${pkgs.playerctl}/bin/playerctl#" i3lock-pixeled + ''; + + meta = with stdenv.lib; { + description = "Simple i3lock helper which pixels a screenshot by scaling it down and up to get a pixeled version of the screen when the lock is active."; + homepage = "https://github.com/Ma27/i3lock-pixeled"; + license = licenses.mit; + platform = platforms.linux; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3fac1be85085..86acdd52b84a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14308,6 +14308,8 @@ with pkgs; i3lock-fancy = callPackage ../applications/window-managers/i3/lock-fancy.nix { }; + i3lock-pixeled = callPackage ../misc/screensavers/i3lock-pixeled/default.nix { }; + i3minator = callPackage ../tools/misc/i3minator { }; i3pystatus = callPackage ../applications/window-managers/i3/pystatus.nix { }; From 1deb1a30c88113a46b794d8e99473d28e99c0b5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 20 May 2017 17:45:51 +0100 Subject: [PATCH 2/2] i3lock-pixeled: use substituteInPlace --- pkgs/misc/screensavers/i3lock-pixeled/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/screensavers/i3lock-pixeled/default.nix b/pkgs/misc/screensavers/i3lock-pixeled/default.nix index 735bbb5d4277..b14812f920a8 100644 --- a/pkgs/misc/screensavers/i3lock-pixeled/default.nix +++ b/pkgs/misc/screensavers/i3lock-pixeled/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { ]; patchPhase = '' - # patch paths - sed -i -e "s#i3lock#${pkgs.i3lock}/bin/i3lock#" i3lock-pixeled - sed -i -e "s#convert#${pkgs.imagemagick}/bin/convert#" i3lock-pixeled - sed -i -e "s#scrot#${pkgs.scrot}/bin/scrot#" i3lock-pixeled - sed -i -e "s#playerctl#${pkgs.playerctl}/bin/playerctl#" i3lock-pixeled + substituteInPlace i3lock-pixeled \ + --replace i3lock "${pkgs.i3lock}/bin/i3lock" \ + --replace convert "${pkgs.imagemagick}/bin/convert" \ + --replace scrot "${pkgs.scrot}/bin/scrot" \ + --replace playerctl "${pkgs.playerctl}/bin/playerctl#" ''; meta = with stdenv.lib; {