fix(overrides): remove btrbk, use stable alacritty and discord

This commit is contained in:
steveej 2022-05-05 13:56:26 +02:00
parent 40ea751b5e
commit 943f7a1be0
2 changed files with 19 additions and 19 deletions

View file

@ -116,7 +116,7 @@ in {
evolution # gnome4.glib_networking evolution # gnome4.glib_networking
unstablepkgs.kotatogram-desktop unstablepkgs.kotatogram-desktop
gnome3.cheese gnome3.cheese
unstablepkgs.discord discord
# Virtualization # Virtualization
virtmanager virtmanager

View file

@ -16,7 +16,7 @@ in {
buildInputs = [ super.makeWrapper ]; buildInputs = [ super.makeWrapper ];
phases = "installPhase"; phases = "installPhase";
installPhase = '' installPhase = ''
makeWrapper ${self.nixpkgs-master.alacritty}/bin/alacritty $out/bin/alacritty \ makeWrapper ${super.alacritty}/bin/alacritty $out/bin/alacritty \
--set-default WINIT_X11_SCALE_FACTOR 1.4 --set-default WINIT_X11_SCALE_FACTOR 1.4
''; '';
}; };
@ -29,23 +29,23 @@ in {
]); ]);
}); });
btrbk = super.btrbk.overrideAttrs(attrs: rec { # btrbk = super.btrbk.overrideAttrs(attrs: rec {
version = "0.30.0"; # version = "0.32.1";
src = builtins.fetchurl { # src = builtins.fetchurl {
url = "https://digint.ch/download/btrbk/releases/${attrs.pname}-${version}.tar.xz"; # url = "https://digint.ch/download/btrbk/releases/${attrs.pname}-${version}.tar.xz";
sha256 = "1wlp0z0ijv3cr155kp9c5l16dz4jf8h897ddnawaj9rj1zgfk9z8"; # sha256 = "1wlp0z0ijv3cr155kp9c5l16dz4jf8h897ddnawaj9rj1zgfk9z8";
}; # };
# version = "2020-12-30"; # # version = "2020-12-30";
# src = builtins.fetchurl { # # src = builtins.fetchurl {
# url = "https://github.com/digint/btrbk/archive/dd5991099ad778a3e0c5d11c770ad169c3095068.tar.gz"; # # url = "https://github.com/digint/btrbk/archive/dd5991099ad778a3e0c5d11c770ad169c3095068.tar.gz";
# sha256 = "0iyjgr1nv1n7mpsrgkrmb85sz3ycimmfvvhj08cvkjgl0r1762sb"; # # sha256 = "0iyjgr1nv1n7mpsrgkrmb85sz3ycimmfvvhj08cvkjgl0r1762sb";
# }; # # };
preFixup = '' # preFixup = ''
wrapProgram $out/bin/btrbk \ # wrapProgram $out/bin/btrbk \
--set PERL5LIB $PERL5LIB \ # --set PERL5LIB $PERL5LIB \
--prefix PATH ':' "${self.lib.makeBinPath (with self; [ btrfs-progs bash mbuffer openssh ])}" # --prefix PATH ':' "${self.lib.makeBinPath (with self; [ btrfs-progs bash mbuffer openssh ])}"
''; # '';
}); # });
} }