From 2e673eefb7c9a22909dd8f94eb1f5cb3b319122b Mon Sep 17 00:00:00 2001 From: talksik Date: Sun, 30 Jul 2023 11:35:53 -0700 Subject: [PATCH] simpler definitions of packages --- shell.nix | 87 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 45 insertions(+), 42 deletions(-) diff --git a/shell.nix b/shell.nix index b8a1b94..61fe0b8 100644 --- a/shell.nix +++ b/shell.nix @@ -1,57 +1,60 @@ { pkgs ? import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/9462344318b376e157c94fa60c20a25b913b2381.tar.gz") { } }: pkgs.mkShell { - buildInputs = [ - pkgs.which - pkgs.curl - pkgs.htop - pkgs.zlib - pkgs.git - pkgs.gh - pkgs.curl - pkgs.python39 - pkgs.podman - pkgs.tmux - pkgs.go - pkgs.clang - pkgs.postgresql - pkgs.neovim - pkgs.ripgrep - pkgs.packer - pkgs.nodejs - pkgs.cmake - pkgs.rustc - pkgs.cargo - pkgs.rustup - pkgs.tldr - pkgs.meson - pkgs.protobuf3_20 - pkgs.protoc-gen-go - pkgs.protoc-gen-go-grpc - pkgs.sqlc - pkgs.go-task - pkgs.grpcurl + buildInputs = with pkgs; [ + which + curl + htop + zlib + git + gh + curl + python39 + podman + tmux + go + clang + postgresql + neovim + ripgrep + packer + nodejs + cmake + rustc + cargo + rustup + tldr + meson + protobuf3_20 + protoc-gen-go + protoc-gen-go-grpc + sqlc + go-task + grpcurl - pkgs.gst_all_1.gstreamer - pkgs.gst_all_1.gst-plugins-base + gst_all_1.gstreamer + gst_all_1.gst-plugins-base (pkgs.gst_all_1.gst-plugins-good.override { # can only have one of these qt6Support = true; #qt5Support = true; }) - pkgs.gst_all_1.gst-plugins-bad - pkgs.gst_all_1.gst-plugins-ugly - pkgs.gst_all_1.gst-libav - pkgs.gst_all_1.gst-vaapi + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly + gst_all_1.gst-libav + gst_all_1.gst-vaapi - pkgs.qt6.full - pkgs.mesa - pkgs.libGL - pkgs.gst_all_1.gstreamermm - pkgs.libxkbcommon # for qt + qt6.full + mesa + libGL + gst_all_1.gstreamermm + libxkbcommon # for qt + fzf + ]; - pkgs.fzf + nativeBuildInputs = with pkgs; [ + pkg-config ]; shellHook = ''