diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-03-28 21:15:15 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-03-28 21:15:15 +0100 |
commit | a36be028f5a5dcc55f488a78fc0f58b4b8e4033c (patch) | |
tree | fee5e8989465811c0472b082260a2d9e91cd334b /pkgs/applications/window-managers | |
parent | 48a137da7301f3ec5e15f8c32945b64581ef9f70 (diff) | |
parent | 7f4e4b279e729c05f1b18da867c6d2fd2c2ab2f3 (diff) | |
download | nixpkgs-a36be028f5a5dcc55f488a78fc0f58b4b8e4033c.tar nixpkgs-a36be028f5a5dcc55f488a78fc0f58b4b8e4033c.tar.gz nixpkgs-a36be028f5a5dcc55f488a78fc0f58b4b8e4033c.tar.bz2 nixpkgs-a36be028f5a5dcc55f488a78fc0f58b4b8e4033c.tar.lz nixpkgs-a36be028f5a5dcc55f488a78fc0f58b4b8e4033c.tar.xz nixpkgs-a36be028f5a5dcc55f488a78fc0f58b4b8e4033c.tar.zst nixpkgs-a36be028f5a5dcc55f488a78fc0f58b4b8e4033c.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/window-managers')
-rw-r--r-- | pkgs/applications/window-managers/i3/lock-fancy.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/window-managers/notion/default.nix | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/applications/window-managers/i3/lock-fancy.nix b/pkgs/applications/window-managers/i3/lock-fancy.nix index 4ca69ce31b4..b6b354021d9 100644 --- a/pkgs/applications/window-managers/i3/lock-fancy.nix +++ b/pkgs/applications/window-managers/i3/lock-fancy.nix @@ -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 diff --git a/pkgs/applications/window-managers/notion/default.nix b/pkgs/applications/window-managers/notion/default.nix index 2b9e8237a04..ac4f00f4545 100644 --- a/pkgs/applications/window-managers/notion/default.nix +++ b/pkgs/applications/window-managers/notion/default.nix @@ -7,22 +7,22 @@ stdenv.mkDerivation rec{ pname = "notion"; - version = "3-2019050101"; + version = "4.0.0"; src = fetchFromGitHub { owner = "raboof"; repo = pname; rev = version; - sha256 = "09kvgqyw0gnj3jhz9gmwq81ak8qy32vyanx1hw79r6m181aysspz"; + sha256 = "0rqfvwkj0j862hf6i4wsmb6185xibsskfj9kwy896qcpcg8w4kk7"; }; nativeBuildInputs = [ pkgconfig makeWrapper groff ]; buildInputs = [ lua gettext which readline fontconfig libX11 libXext libSM libXinerama libXrandr libXft xlibsWrapper ]; - buildFlags = [ "CC=cc" "LUA_DIR=${lua}" "X11_PREFIX=/no-such-path" ]; + buildFlags = [ "LUA_DIR=${lua}" "X11_PREFIX=/no-such-path" ]; - makeFlags = [ "PREFIX=\${out}" ]; + makeFlags = [ "NOTION_RELEASE=${version}" "PREFIX=\${out}" ]; postInstall = '' wrapProgram $out/bin/notion \ @@ -30,10 +30,10 @@ stdenv.mkDerivation rec{ ''; meta = with stdenv.lib; { - description = "Tiling tabbed window manager, follow-on to the Ion"; - homepage = "https://notionwm.net/"; + description = "Tiling tabbed window manager"; + homepage = "https://notionwm.net"; license = licenses.lgpl21; - maintainers = with maintainers; [ jfb AndersonTorres ]; + maintainers = with maintainers; [ jfb AndersonTorres raboof ]; platforms = platforms.linux; }; } |