teutat3s/os
2
0
Fork 0
forked from pub-solar/os
Code Pull requests Activity

chore: cleanup overlays as we're following nixos-unstable

Browse source
This commit is contained in:
teutat3s 2023-11-20 18:43:39 +01:00
parent ed9d06629c
commit 865e05bd3e
Signed by: teutat3s
GPG key ID: 4FA1D3FA524F22C1
3 changed files with 19 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
modules/nix/default.nix
View file

@ -6,8 +6,11 @@
... ...
}: { }: {
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
"1password"
"1password-cli"
"cups-brother-hl3140cw" "cups-brother-hl3140cw"
"facetimehd-firmware" "facetimehd-firmware"
"slack"
"veracrypt" "veracrypt"
"zoom" "zoom"
]; ];

26
overlays/default.nix
View file

@ -13,34 +13,22 @@
let let
unstable = import inputs.unstable { unstable = import inputs.unstable {
system = prev.system; system = prev.system;
config.allowUnfreePredicate = pkg: builtins.elem (prev.lib.getName pkg) [ #config.allowUnfreePredicate = pkg: builtins.elem (prev.lib.getName pkg) [
"1password-cli" # "1password-cli"
"1password" # "1password"
"slack" # "slack"
]; #];
}; };
in in
{ {
nixd = unstable.nixd; #slack = unstable.slack;
#vimPlugins = prev.vimPlugins // {inherit (unstable.vimPlugins) nvim-lspconfig;};
_1password = unstable._1password;
_1password-gui = unstable._1password-gui;
thunderbird = unstable.thunderbird;
docker_24 = unstable.docker_24;
flyctl = unstable.flyctl;
slack = unstable.slack;
vimPlugins = prev.vimPlugins // {inherit (unstable.vimPlugins) nvim-lspconfig;};
}) })
(import ../pkgs) (import ../pkgs)
(import ./blesh.nix) (import ./blesh.nix)
(import ./manix.nix) (import ./manix.nix)
(import ./mdbook-multilang.nix inputs) (import ./mdbook-multilang.nix inputs)
(import ./prr.nix) (import ./prr.nix)
(import ./rnix-lsp.nix)
(import ./neovim-plugins.nix) (import ./neovim-plugins.nix)
(import ./signal-desktop.nix) (import ./signal-desktop.nix)
]; ];

17
overlays/signal-desktop.nix
View file

@ -1,23 +1,20 @@
final: prev: { final: prev: {
signal-desktop = prev.signal-desktop.overrideAttrs (oldAttrs: rec { signal-desktop = prev.signal-desktop.overrideAttrs (oldAttrs: rec {
inherit (oldAttrs) pname; inherit (oldAttrs) pname;
version = "6.38.0";
hash = "sha256-y2mwO7Qc01vuIeJUcAxYDD97DXOwXCd8wNZmkG4maF0=";
dir = "Signal"; dir = "Signal";
src = prev.fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/s/${pname}/${pname}_${version}_amd64.deb";
inherit hash;
};
preFixup = '' preFixup = ''
gappsWrapperArgs+=( gappsWrapperArgs+=(
--prefix LD_LIBRARY_PATH : "${prev.lib.makeLibraryPath [ prev.stdenv.cc.cc prev.pipewire ] }" --prefix LD_LIBRARY_PATH : "${prev.lib.makeLibraryPath [ prev.stdenv.cc.cc prev.pipewire ] }"
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-features=UseOzonePlatform --ozone-platform=wayland}}" # Currently crashes see https://github.com/NixOS/nixpkgs/issues/222043
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
--suffix PATH : ${prev.lib.makeBinPath [ prev.xdg-utils ]} --suffix PATH : ${prev.lib.makeBinPath [ prev.xdg-utils ]}
) )
# Fix the desktop link
# Fix the desktop link and fix showing application icon in tray
substituteInPlace $out/share/applications/${pname}.desktop \ substituteInPlace $out/share/applications/${pname}.desktop \
--replace "/opt/${dir}/${pname}" $out/bin/${pname} --replace "/opt/${dir}/${pname}" $out/bin/${pname} \
${if pname == "signal-desktop" then "--replace \"bin/signal-desktop\" \"bin/signal-desktop --use-tray-icon\"" else ""}
autoPatchelf --no-recurse -- "$out/lib/${dir}/" autoPatchelf --no-recurse -- "$out/lib/${dir}/"
patchelf --add-needed ${prev.libpulseaudio}/lib/libpulse.so "$out/lib/${dir}/resources/app.asar.unpacked/node_modules/@signalapp/ringrtc/build/linux/libringrtc-x64.node" patchelf --add-needed ${prev.libpulseaudio}/lib/libpulse.so "$out/lib/${dir}/resources/app.asar.unpacked/node_modules/@signalapp/ringrtc/build/linux/libringrtc-x64.node"
''; '';