diff options
| -rw-r--r-- | hosts/caladan/default.nix | 4 | ||||
| -rw-r--r-- | hosts/common/core/nix.nix | 4 | ||||
| -rw-r--r-- | hosts/common/optional/gui.nix | 8 | ||||
| -rw-r--r-- | pkgs/sdrconnect/default.nix | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/hosts/caladan/default.nix b/hosts/caladan/default.nix index 8e47960..1c8af52 100644 --- a/hosts/caladan/default.nix +++ b/hosts/caladan/default.nix @@ -168,8 +168,8 @@ pkgs.nss pkgs.pango pkgs.vulkan-loader - pkgs.xorg.libXcomposite - pkgs.xorg.libXdamage + pkgs.libxcomposite + pkgs.libxdamage ]; }; }; diff --git a/hosts/common/core/nix.nix b/hosts/common/core/nix.nix index 4760af0..7370241 100644 --- a/hosts/common/core/nix.nix +++ b/hosts/common/core/nix.nix @@ -1,4 +1,4 @@ -{ inputs, lib, pkgs, ... }: +{ inputs, lib, ... }: { nix = { gc = { @@ -7,7 +7,7 @@ options = "--delete-older-than 7d"; randomizedDelaySec = "5min"; }; - package = pkgs.nixVersions.latest; + #package = pkgs.nixVersions.latest; settings = { auto-optimise-store = lib.mkDefault true; experimental-features = [ "nix-command" "flakes" ]; diff --git a/hosts/common/optional/gui.nix b/hosts/common/optional/gui.nix index 215bbe3..56650ff 100644 --- a/hosts/common/optional/gui.nix +++ b/hosts/common/optional/gui.nix @@ -32,10 +32,10 @@ pkgs.wireshark pkgs.xclip pkgs.xdotool - pkgs.xorg.appres - pkgs.xorg.editres - pkgs.xorg.xdpyinfo - pkgs.xorg.xev + pkgs.appres + pkgs.editres + pkgs.xdpyinfo + pkgs.xev pkgs.xsnow pkgs.xterm ]; diff --git a/pkgs/sdrconnect/default.nix b/pkgs/sdrconnect/default.nix index d6c3957..e1a866c 100644 --- a/pkgs/sdrconnect/default.nix +++ b/pkgs/sdrconnect/default.nix @@ -60,9 +60,9 @@ in runtimeDependencies = [ icu - xorg.libX11 - xorg.libICE - xorg.libSM + libx11 + libice + libsm ]; appendRunpaths = [ "${placeholder "out"}/lib" ]; |