diff options
Diffstat (limited to 'modules/root')
| -rw-r--r-- | modules/root/software/desktop.nix | 2 | ||||
| -rw-r--r-- | modules/root/software/overlays.nix | 2 | ||||
| -rw-r--r-- | modules/root/x11.nix | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/modules/root/software/desktop.nix b/modules/root/software/desktop.nix index dbcce1e..b8cd1e7 100644 --- a/modules/root/software/desktop.nix +++ b/modules/root/software/desktop.nix @@ -49,7 +49,7 @@ # Graphics blender geeqie - gimp + gimp3 inkscape ] ++ pkgs.lib.optionals config.software.desktop.office.enable [ # Office diff --git a/modules/root/software/overlays.nix b/modules/root/software/overlays.nix index 04ad398..bdb23fd 100644 --- a/modules/root/software/overlays.nix +++ b/modules/root/software/overlays.nix @@ -3,7 +3,6 @@ (final: prev: { crazydiskinfo = (callPackage ./derivations/crazydiskinfo {}); lowbat = (callPackage ./derivations/lowbat {}); - st = (callPackage ./derivations/st {}); workcentre-7800-series = (callPackage ./derivations/xerox-workcentre-7800-series-driver {}); # Use my vimv-rs until pr gets merged @@ -16,5 +15,6 @@ }; }); }) + (import ./derivations/st/overrides.nix) ]; } diff --git a/modules/root/x11.nix b/modules/root/x11.nix index b7b23ae..f5a07b4 100644 --- a/modules/root/x11.nix +++ b/modules/root/x11.nix @@ -12,17 +12,17 @@ nixpkgs.overlays = with pkgs; [ (final: prev: { xorg = prev.xorg // { - xinit = (prev.xorg.xinit.overrideAttrs (oldAttrs: rec { + xinit = (prev.xorg.xinit.overrideAttrs (finalAttrs: previousAttrs: { version = "1.4.4"; - patchtag = "${version}-1"; # Archlinux xinit package tagged release to fetch patch from + patchtag = "${finalAttrs.version}-1"; # Archlinux xinit package tagged release to fetch patch from # Override src since is hardcoded to 1.4.2 src = prev.fetchurl { - url = "mirror://xorg/individual/app/xinit-${version}.tar.xz"; + url = "mirror://xorg/individual/app/xinit-${finalAttrs.version}.tar.xz"; sha256 = "sha256-QKR8ehZMf5gc43h7Szf35BH7QyMdzeVD1wCUB12s/vk="; }; patches = [ (prev.fetchpatch { - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/xorg-xinit/-/raw/${patchtag}/06_move_serverauthfile_into_tmp.diff"; + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/xorg-xinit/-/raw/${finalAttrs.patchtag}/06_move_serverauthfile_into_tmp.diff"; sha256 = "1whzs5bw7ph12r3abs1g9fydibkr291jh56a0zp17d4x070jnkda"; }) ]; |