diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2018-01-29 19:00:30 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-29 19:00:30 +0000 |
| commit | 303d5b119e3f3342cb6f8c3fc2314c462f2ed5fc (patch) | |
| tree | 2be07409b649eb271765c0912091fa7e40692686 | |
| parent | 60331e6e9062ff4a9d880c9559bc64f5a32e4757 (diff) | |
| parent | ba12a867f7d57e60466a9715be402fb56e861749 (diff) | |
| download | nixpkgs-303d5b119e3f3342cb6f8c3fc2314c462f2ed5fc.tar nixpkgs-303d5b119e3f3342cb6f8c3fc2314c462f2ed5fc.tar.gz nixpkgs-303d5b119e3f3342cb6f8c3fc2314c462f2ed5fc.tar.bz2 nixpkgs-303d5b119e3f3342cb6f8c3fc2314c462f2ed5fc.tar.lz nixpkgs-303d5b119e3f3342cb6f8c3fc2314c462f2ed5fc.tar.xz nixpkgs-303d5b119e3f3342cb6f8c3fc2314c462f2ed5fc.tar.zst nixpkgs-303d5b119e3f3342cb6f8c3fc2314c462f2ed5fc.zip | |
Merge pull request #34259 from psychon/awesome-cleanup
awesome: Remove $LD_LIBRARY_PATH handling
| -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 \ |