From f3a5f9b390c1befbf16fd6ae50938c2aaead2aa5 Mon Sep 17 00:00:00 2001 From: deva Date: Wed, 21 Aug 2024 16:01:16 -0400 Subject: [PATCH] nix-ld --- flake.lock | 8 +++--- flake.nix | 2 +- modules/nixos/nix-ld.nix | 60 ++++++++++++++++++++++++++++++++++++++++ waves.nix | 1 + 4 files changed, 66 insertions(+), 5 deletions(-) create mode 100644 modules/nixos/nix-ld.nix diff --git a/flake.lock b/flake.lock index 0efac33..13c2b9b 100644 --- a/flake.lock +++ b/flake.lock @@ -148,16 +148,16 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1724098845, - "narHash": "sha256-D5HwjQw/02fuXbR4LCTo64koglP2j99hkDR79/3yLOE=", + "lastModified": 1723991338, + "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f1bad50880bae73ff2d82fafc22010b4fc097a9c", + "rev": "8a3354191c0d7144db9756a74755672387b702ba", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index a3c4aef..d1140c4 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; - nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-24.05"; + nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; flake-utils.url = "github:numtide/flake-utils"; home-manager = { diff --git a/modules/nixos/nix-ld.nix b/modules/nixos/nix-ld.nix new file mode 100644 index 0000000..784b106 --- /dev/null +++ b/modules/nixos/nix-ld.nix @@ -0,0 +1,60 @@ +{ pkgs, ... }: +{ + # Enable nix ld + programs.nix-ld.enable = true; + + programs.nix-ld.libraries = with pkgs; [ + alsa-lib + at-spi2-atk + at-spi2-core + atk + cairo + cups + curl + dbus + expat + fontconfig + freetype + fuse3 + gdk-pixbuf + glib + gtk3 + icu + libGL + libappindicator-gtk3 + libdrm + libglvnd + libnotify + libpulseaudio + libunwind + libusb1 + libuuid + libxkbcommon + libxml2 + mesa + nspr + nss + openssl + pango + pipewire + stdenv.cc.cc + stdenv.cc.cc.lib + systemd + vulkan-loader + xorg.libX11 + xorg.libXScrnSaver + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXtst + xorg.libxcb + xorg.libxkbfile + xorg.libxshmfence + zlib + ]; +} diff --git a/waves.nix b/waves.nix index 22c8b83..a5faf4e 100644 --- a/waves.nix +++ b/waves.nix @@ -23,6 +23,7 @@ inputs, ./modules/nixos/gui.nix ./modules/nixos/i18n.nix ./modules/nixos/zsh.nix + ./modules/nixos/nix-ld.nix ]; system.stateVersion = "24.05";