From 22839da3da1851f2a61b07d48edb9d69641498a0 Mon Sep 17 00:00:00 2001 From: Jamie Brandon Date: Fri, 8 Apr 2022 11:09:10 -0700 Subject: [PATCH] Pin nixos version --- shell.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/shell.nix b/shell.nix index 1e57706..a844239 100644 --- a/shell.nix +++ b/shell.nix @@ -2,7 +2,11 @@ let - nixpkgs = ; + nixpkgs = builtins.fetchTarball { + name = "nixos-21.11"; + url = "https://github.com/NixOS/nixpkgs/archive/refs/tags/21.11.tar.gz"; + sha256 = "162dywda2dvfj1248afxc45kcrg83appjd0nmdb541hl7rnncf02"; + }; hostPkgs = import nixpkgs {}; @@ -55,7 +59,7 @@ hostPkgs.mkShell rec { hostPkgs.pkg-config targetPkgs.libGL.all targetPkgs.xorg.libX11.dev - targetPkgs.xlibs.xorgproto + targetPkgs.xorg.xorgproto targetPkgs.SDL2.all targetPkgs.SDL2_ttf.all targetPkgs.pcre2.all @@ -64,7 +68,7 @@ hostPkgs.mkShell rec { NIX_GCC=targetPkgs.gcc; NIX_LIBGL_DEV=targetPkgs.libGL.dev; NIX_LIBX11_DEV=targetPkgs.xorg.libX11.dev; - NIX_XORGPROTO_DEV=targetPkgs.xlibs.xorgproto; + NIX_XORGPROTO_DEV=targetPkgs.xorg.xorgproto; NIX_SDL2_DEV=targetPkgs.SDL2.dev; NIX_SDL2_TTF_DEV=targetPkgs.SDL2_ttf; # no .dev # TODO with SDL_VIDEODRIVER=wayland, SDL doesn't seem to respect xkb settings eg caps vs ctrl -- 2.45.2