Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2df17ecf1b74
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2dcbd447e42c
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on May 7, 2019

  1. awesome: use makeWrapper rather than wrapProgram 

    Using wrapProgram makes so that the generated "awesome" wrapper duplicates its
command line options at every restart.

As @psychon puts it:

> AwesomeWM restarts via execvp(argv[0], argv). In NixOS, wrapProgram is used
> to generate a wrapper around the real binary. wrapProgram calls makeWrapper
> with --argv0 '$0'. I guess this is what makes awesomeWM run the wrapper again
> on restart. Without this --argv0 awesomeWM would directly restart itself
> instead of the wrapper, I think.

(cherry picked from commit 88f84c0)
    @stefano-m @Mic92
    stefano-m authored and Mic92 committed May 7, 2019
    Copy the full SHA
    49a9155 View commit details

  2. nix-review: 2.0.0 -> 2.0.1 

    (cherry picked from commit cf5ed1d)
    @Mic92
    Mic92 committed May 7, 2019
    Copy the full SHA
    2dcbd44 View commit details
Showing with 6 additions and 3 deletions.
  1. +4 −1 pkgs/applications/window-managers/awesome/default.nix
  2. +2 −2 pkgs/tools/package-management/nix-review/default.nix
5 changes: 4 additions & 1 deletion pkgs/applications/window-managers/awesome/default.nix
View file
Original file line number Diff line number Diff line change
@@ -46,7 +46,10 @@ with luaPackages; stdenv.mkDerivation rec {
LUA_PATH = "?.lua;${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua";

postInstall = ''
wrapProgram $out/bin/awesome \
# Don't use wrapProgram or or the wrapper will duplicate the --search
# arguments every restart
mv "$out/bin/awesome" "$out/bin/.awesome-wrapped"
makeWrapper "$out/bin/.awesome-wrapped" "$out/bin/awesome" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--add-flags '--search ${lgi}/lib/lua/${lua.luaversion}' \
--add-flags '--search ${lgi}/share/lua/${lua.luaversion}' \
4 changes: 2 additions & 2 deletions pkgs/tools/package-management/nix-review/default.nix
View file
Original file line number Diff line number Diff line change
@@ -8,13 +8,13 @@

python3.pkgs.buildPythonApplication rec {
pname = "nix-review";
version = "2.0.0";
version = "2.0.1";

src = fetchFromGitHub {
owner = "Mic92";
repo = "nix-review";
rev = version;
sha256 = "1hichipf02yz9n2n1fnky5rm9wxwcd04xlr0y05y78ixw8xb5ah0";
sha256 = "19x0wbb8annmzi67r79112j9kjzz99n3qd6adh80iqx2dh47pk5g";
};

makeWrapperArgs = [