diff options
| author | Uli Schlachter <psychon@znc.in> | 2018-01-25 16:46:12 +0100 |
|---|---|---|
| committer | Uli Schlachter <psychon@znc.in> | 2018-01-25 16:46:12 +0100 |
| commit | ba12a867f7d57e60466a9715be402fb56e861749 (patch) | |
| tree | e5bcec0e21071cb329426269840b8eeb5550091e | |
| parent | f83b6e1130e3193dd9480ca5d60b764870de9d3f (diff) | |
| download | nixpkgs-ba12a867f7d57e60466a9715be402fb56e861749.tar nixpkgs-ba12a867f7d57e60466a9715be402fb56e861749.tar.gz nixpkgs-ba12a867f7d57e60466a9715be402fb56e861749.tar.bz2 nixpkgs-ba12a867f7d57e60466a9715be402fb56e861749.tar.lz nixpkgs-ba12a867f7d57e60466a9715be402fb56e861749.tar.xz nixpkgs-ba12a867f7d57e60466a9715be402fb56e861749.tar.zst nixpkgs-ba12a867f7d57e60466a9715be402fb56e861749.zip | |
awesome: Remove $LD_LIBRARY_PATH handling
I have no idea why gobjectIntrospection even was in here. The only
library in there, libgirepository-1.0.so, is not used by awesome. It is
only used by lgi.so and that means it should be found via its RPATH.
The Pango path is not needed in $LD_LIBRARY_PATH ever since
gobjectIntrospection started patching .typelib files with absolute
paths. Relevant commits are 36bef2b26731a9 from 2014
("gobject-introspection: refer to shlibs with absolute paths in
typelibs") and c420de6b05710 from 2016 ("gobject-introspection: Fix
patching shared objects").
The above patches did not work for cairo, because cairo's typelib is a
bit "special". However, this was fixed by e44038bccab0cae some days ago
("gobjectIntrospection: use absolute path for cairo GIR").
Thus, setting $GI_TYPELIB_PATH is enough so that all needed libraries
are found.
Fixes: https://github.com/NixOS/nixpkgs/issues/14164
Signed-off-by: Uli Schlachter <psychon@znc.in>
| -rw-r--r-- | pkgs/applications/window-managers/awesome/default.nix | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index ca596cdfddc..2808c8552ef 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -41,7 +41,6 @@ with luaPackages; stdenv.mkDerivation rec { #cmakeFlags = "-DGENERATE_MANPAGES=ON"; cmakeFlags = "-DOVERRIDE_VERSION=${version}"; - LD_LIBRARY_PATH = "${stdenv.lib.makeLibraryPath [ cairo pango gobjectIntrospection ]}"; GI_TYPELIB_PATH = "${pango.out}/lib/girepository-1.0"; LUA_CPATH = "${lgi}/lib/lua/${lua.luaversion}/?.so"; LUA_PATH = "${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua"; @@ -52,7 +51,6 @@ with luaPackages; stdenv.mkDerivation rec { --add-flags '--search ${lgi}/lib/lua/${lua.luaversion}' \ --add-flags '--search ${lgi}/share/lua/${lua.luaversion}' \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \ --prefix PATH : "${stdenv.lib.makeBinPath [ compton unclutter procps iproute coreutils curl alsaUtils findutils xterm ]}" wrapProgram $out/bin/awesome-client \ |