Compare commits

..

1 Commits

Author SHA1 Message Date
Nelson Torres 740f081d7e Default.nix fix:
Since the last `poetry` update the command `poetry shell` have been
moved to a plugin, this affects the entire instalation, so now we
need to add more deps to the `buildInputs` and added to the
`LD_LIBRARY_PATH`

To run a command now you need to do something like this:

`poetry run piker ...`
2025-01-30 14:36:30 -03:00
1 changed files with 1 additions and 5 deletions

View File

@ -1,7 +1,6 @@
with (import <nixpkgs> {}); with (import <nixpkgs> {});
let let
glibStorePath = lib.getLib glib; glibStorePath = lib.getLib glib;
zlibStorePath = lib.getLib zlib;
zstdStorePath = lib.getLib zstd; zstdStorePath = lib.getLib zstd;
dbusStorePath = lib.getLib dbus; dbusStorePath = lib.getLib dbus;
libGLStorePath = lib.getLib libGL; libGLStorePath = lib.getLib libGL;
@ -30,7 +29,6 @@ stdenv.mkDerivation {
buildInputs = [ buildInputs = [
# System requirements. # System requirements.
glib glib
zlib
dbus dbus
zstd zstd
libGL libGL
@ -72,7 +70,6 @@ stdenv.mkDerivation {
LIB_GCC_PATH="${libgcc.lib}/lib" LIB_GCC_PATH="${libgcc.lib}/lib"
GLIB_PATH="${glibStorePath}/lib" GLIB_PATH="${glibStorePath}/lib"
ZSTD_PATH="${zstdStorePath}/lib" ZSTD_PATH="${zstdStorePath}/lib"
ZLIB_PATH="${zlibStorePath}/lib"
DBUS_PATH="${dbusStorePath}/lib" DBUS_PATH="${dbusStorePath}/lib"
LIBGL_PATH="${libGLStorePath}/lib" LIBGL_PATH="${libGLStorePath}/lib"
FREETYPE_PATH="${freetypeStorePath}/lib" FREETYPE_PATH="${freetypeStorePath}/lib"
@ -95,7 +92,6 @@ stdenv.mkDerivation {
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_GCC_PATH" LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_GCC_PATH"
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$DBUS_PATH" LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$DBUS_PATH"
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$GLIB_PATH" LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$GLIB_PATH"
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$ZLIB_PATH"
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$ZSTD_PATH" LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$ZSTD_PATH"
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIBGL_PATH" LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIBGL_PATH"
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$FONTCONFIG_PATH" LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$FONTCONFIG_PATH"