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

Commits on Mar 21, 2020

  1. i3lock-fancy: Fix wrong path to mktemp 

    mktemp was not correctly replaced in this package. Leading to
"command not found: mktemp" error.
    @exi
    exi committed Mar 21, 2020
    Copy the full SHA
    55fb13e View commit details

Commits on Mar 22, 2020

  1. Update pkgs/applications/window-managers/i3/lock-fancy.nix 

    Co-Authored-By: Enteee <ducksource@duckpond.ch>
    @exi @Enteee
    exi and Enteee authored Mar 22, 2020
    Copy the full SHA
    accabd1 View commit details

Commits on Mar 24, 2020

  1. Merge pull request #83083 from exi/fancy 

    i3lock-fancy: Fix wrong path to mktemp
    @Ma27
    Ma27 authored Mar 24, 2020
    Copy the full SHA
    35b2ad7 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/applications/window-managers/i3/lock-fancy.nix
2 changes: 1 addition & 1 deletion pkgs/applications/window-managers/i3/lock-fancy.nix
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "00lqsvz1knb8iqy8lnkn3sf4c2c4nzb0smky63qf48m8za5aw9b1";
};
patchPhase = ''
sed -i -e "s|(mktemp)|(${coreutils}/bin/mktemp)|" i3lock-fancy
sed -i -e "s|mktemp|${coreutils}/bin/mktemp|" i3lock-fancy
sed -i -e "s|'rm -f |'${coreutils}/bin/rm -f |" i3lock-fancy
sed -i -e "s|scrot -z |${scrot}/bin/scrot -z |" i3lock-fancy
sed -i -e "s|convert |${imagemagick.out}/bin/convert |" i3lock-fancy