From 024414f501fdbed1489050fd11092889a4305da2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Ga=C5=82kowski?= <kpg@posteo.net>
Date: Mon, 16 Aug 2021 22:12:57 +0200
Subject: [PATCH] lisp-modules: use lib.makeSearchPath in shell.nix

---
 pkgs/development/lisp-modules/shell.nix | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/lisp-modules/shell.nix b/pkgs/development/lisp-modules/shell.nix
index bd6eea65f6f3..9fc0c0b2aa0a 100644
--- a/pkgs/development/lisp-modules/shell.nix
+++ b/pkgs/development/lisp-modules/shell.nix
@@ -10,7 +10,28 @@ self = rec {
     freetds
     lispPackages.quicklisp-to-nix lispPackages.quicklisp-to-nix-system-info
   ];
-  CPATH = "${libfixposix}/include";
-  LD_LIBRARY_PATH = "${openssl.out}/lib:${fuse}/lib:${libuv}/lib:${libev}/lib:${libmysqlclient}/lib:${libmysqlclient}/lib/mysql:${postgresql.lib}/lib:${sqlite.out}/lib:${libfixposix}/lib:${freetds}/lib:${openssl_lib_marked}/lib:${glib.out}/lib:${gdk-pixbuf}/lib:${cairo}/lib:${pango.out}/lib:${gtk3}/lib:${webkitgtk}/lib:${gobject-introspection}/lib";
+  CPATH = lib.makeSearchPath "include"
+    [ libfixposix
+    ];
+  LD_LIBRARY_PATH = lib.makeLibraryPath
+    [ cairo
+      freetds
+      fuse
+      gdk-pixbuf
+      glib
+      gobject-introspection
+      gtk3
+      libev
+      libfixposix
+      libmysqlclient
+      libuv
+      openssl
+      openssl_lib_marked
+      pango
+      postgresql
+      sqlite
+      webkitgtk
+    ]
+    + ":${libmysqlclient}/lib/mysql";
 };
 in stdenv.mkDerivation self