Flake : Use nixpkgs.lib instead of pkgs.lib.

This commit is contained in:
Dmitry Voronin 2024-02-08 00:53:02 +03:00
parent 10c469c9a1
commit e40be04dfe
6 changed files with 3 additions and 53 deletions

View file

@ -9,7 +9,7 @@
let let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
lib = pkgs.lib; lib = nixpkgs.lib;
in { in {
devShell.${system} = pkgs.mkShell rec { devShell.${system} = pkgs.mkShell rec {
nativeBuildInputs = with pkgs; [ nativeBuildInputs = with pkgs; [

View file

@ -1,13 +0,0 @@
with import <nixpkgs> {};
mkShell {
NIX_LD_LIBRARY_PATH = lib.makeLibraryPath [
stdenv.cc.cc
];
NIX_LD = lib.fileContents "${stdenv.cc}/nix-support/dynamic-linker";
buildInputs = [
freesweep
vitetris
];
}

View file

@ -1,26 +0,0 @@
with import <nixpkgs> {};
mkShell {
NIX_LD_LIBRARY_PATH = lib.makeLibraryPath [
alsa-lib
expat
libGL
libpulseaudio
libuuid
libz
nspr
nss
openssl
stdenv.cc.cc
xorg.libX11
xorg.libXcomposite
xorg.libXcursor
xorg.libXdamage
xorg.libXext
xorg.libXfixes
xorg.libXi
xorg.libXrender
xorg.libXtst
];
NIX_LD = lib.fileContents "${stdenv.cc}/nix-support/dynamic-linker";
}

View file

@ -1,12 +0,0 @@
let
pkgs = import <nixpkgs> {};
lib = pkgs.lib;
in
pkgs.mkShell {
nativeBuildInputs = with pkgs; [
cargo
rustc
rust-analyzer
rustfmt
];
}

1
.config/linux/shell/TODO Normal file
View file

@ -0,0 +1 @@
Use flakes here with devShell

View file

@ -3,7 +3,7 @@
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
}; };
outputs = { self, nixpkgs }@inputs: { outputs = { self, nixpkgs } @inputs: {
nixosModules.common.imports = [ nixosModules.common.imports = [
./module/common/Bootloader.nix ./module/common/Bootloader.nix
./module/common/Firewall.nix ./module/common/Firewall.nix