From f51894614d2694d7f44ef66dec2a199d0d6b3d3f Mon Sep 17 00:00:00 2001 From: chayleaf Date: Thu, 16 Feb 2023 20:25:07 +0700 Subject: [PATCH] after updating nix.lock all this soup isn't needed --- flake.nix | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/flake.nix b/flake.nix index 66bc397..0905931 100644 --- a/flake.nix +++ b/flake.nix @@ -55,9 +55,10 @@ } ]; devshell.packages = with pkgs; [ - # from nativeBuildInputs clang-tools gdb + # from nativeBuildInputs + gnumake meson ninja pkg-config @@ -74,19 +75,6 @@ at-spi2-atk atkmm cairo cairomm catch2 fmt_8 fontconfig gdk-pixbuf glibmm gtk3 harfbuzz pango pangomm wayland-protocols ]); - language.c.libraries = with pkgs; [ - # runtime dependencies (normally handled by patchElf) - bzip2 celt dbus expat flac fontconfig freetype fribidi glibc - graphite2 gtk3 howard-hinnant-date icu json-glib libGL - libasyncns libcap libdatrie libepoxy libffi libgcrypt - libgpg-error libgudev libjpeg libogg libopus libpng - libselinux libsndfile libthai libvorbis libwacom libxml2 lz4 - mtdev pcre pcre2 pipewire pixman pulseaudio sndio sqlite - tracker util-linux xorg.libX11 xorg.libXau - xorg.libXcomposite xorg.libXcursor xorg.libXdmcp - xorg.libXext xorg.libXfixes xorg.libXi xorg.libXinerama - xorg.libXrandr xorg.libXrender xorg.libxcb xz zlib zstd - ]; env = with pkgs; [ { name = "CPLUS_INCLUDE_PATH"; prefix = "$DEVSHELL_DIR/include"; } { name = "PKG_CONFIG_PATH"; prefix = "$DEVSHELL_DIR/lib/pkgconfig"; } @@ -95,7 +83,6 @@ { name = "LIBRARY_PATH"; prefix = "${lib.getLib sndio}/lib"; } { name = "LIBRARY_PATH"; prefix = "${lib.getLib zlib}/lib"; } { name = "LIBRARY_PATH"; prefix = "${lib.getLib howard-hinnant-date}/lib"; } - { name = "LD_LIBRARY_PATH"; prefix = "${lib.getLib pulseaudio}/lib/pulseaudio"; } ]; }; });