mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-21 12:59:04 +02:00
Merge pull request #134357 from Uthar/search-paths
lisp-modules: use lib.makeSearchPath in shell.nix
This commit is contained in:
commit
18c7c355fb
|
@ -10,7 +10,28 @@ self = rec {
|
||||||
freetds
|
freetds
|
||||||
lispPackages.quicklisp-to-nix lispPackages.quicklisp-to-nix-system-info
|
lispPackages.quicklisp-to-nix lispPackages.quicklisp-to-nix-system-info
|
||||||
];
|
];
|
||||||
CPATH = "${libfixposix}/include";
|
CPATH = lib.makeSearchPath "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";
|
[ 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
|
in stdenv.mkDerivation self
|
||||||
|
|
Loading…
Reference in a new issue