From badc12bacb83abf32af1e26971a0f5e7e54643dd Mon Sep 17 00:00:00 2001 From: Michael Raitza Date: Sun, 11 Sep 2022 09:55:14 +0200 Subject: [PATCH] Update to nixos 22.05 --- flake.lock | 7 +++---- x-plane/default.nix | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 574ae30..e4871c2 100644 --- a/flake.lock +++ b/flake.lock @@ -2,10 +2,9 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1649541905, - "narHash": "sha256-e8uePwD302weU4saoLg5uhb0yI5ZbHl/L49ncKejh5o=", - "path": "/nix/store/bzydgk2vb1lh6zkf1x77r4l0r0r99kd6-source", - "rev": "db81927829becddb57db2b3b3e34301ed4af8d0a", + "lastModified": 0, + "narHash": "sha256-AtjyEFK7Zp9+hOOUNO1/YZRADV/wC94R3yeKN8saUK4=", + "path": "/nix/store/is6z85ghbw08q2qfpmi671hkjnycw7y7-source", "type": "path" }, "original": { diff --git a/x-plane/default.nix b/x-plane/default.nix index 08375e4..c9c2a8c 100644 --- a/x-plane/default.nix +++ b/x-plane/default.nix @@ -189,12 +189,12 @@ in buildFHSUserEnv rec { # Also add GAppsWrapper environment stuff such that binaries see the GTK theme... - targetPkgs = pkgs: (with pkgs; [ unzip atk gdk_pixbuf cairo pango mesa_glu libGL openalSoft gtk2 glib dbus pulseaudio vulkan-tools vulkan-loader ] ++ + targetPkgs = pkgs: (with pkgs; [ unzip atk gdk-pixbuf cairo pango mesa_glu libGL openalSoft gtk2 glib dbus pulseaudio vulkan-tools vulkan-loader ] ++ (with xorg; [ libX11 libXext libXrandr libXcursor libXinerama ]) ++ # For reality expansion pack [ stdenv.cc.cc.lib curl openssl ] ++ # For fly with lua - [ freeglut libudev ]); + [ freeglut udev ]); extraBuildCommands = '' chmod u+w $out/etc