diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index a673e2b..9c75e4e 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -1,5 +1,6 @@ { config, + inputs, lib, pkgs, ... @@ -68,7 +69,12 @@ cups-pdf.enable = true; }; }; - # environment.sessionVariables = { - # NIXOS_OZONE_WL = "1"; + # environment = { + # systemPackages = [ + # pkgs.pcbu-desktop + # ]; + # # sessionVariables = { + # # NIXOS_OZONE_WL = "1"; + # # }; # }; } diff --git a/overlays/pkgs.nix b/overlays/pkgs.nix index 91c1fad..b40a4d5 100644 --- a/overlays/pkgs.nix +++ b/overlays/pkgs.nix @@ -4,4 +4,5 @@ }: self: super: { rovr = inputs.self.packages.x86_64-linux.rovr; + pcbu-desktop = inputs.self.packages.x86_64-linux.pcbu-desktop; } diff --git a/pkgs/default.nix b/pkgs/default.nix index 710c65a..0527dd0 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -11,6 +11,7 @@ in { packages.${system} = { rovr = pkgs.callPackage ./rovr { }; + pcbu-desktop = pkgs.callPackage ./pcbu-desktop { }; # immich = pkgs.callPackage ./immich { }; }; } diff --git a/pkgs/pcbu-desktop/default.nix b/pkgs/pcbu-desktop/default.nix new file mode 100644 index 0000000..46816df --- /dev/null +++ b/pkgs/pcbu-desktop/default.nix @@ -0,0 +1,52 @@ +{ pkgs }: + +let + pname = "pcbu-desktop"; + version = "3.2.3"; + + src = pkgs.fetchurl { + url = "https://github.com/MeisApps/pcbu-desktop/releases/download/v${version}/PCBioUnlock-x64.AppImage"; + sha256 = "sha256-+NxAm6vhMH51z6BscuFvaMidHN/3tNBR1g+i0q9hjWE="; + }; + +in pkgs.appimageTools.wrapType2 { + inherit pname version src; + + extraPkgs = pkgs: with pkgs; [ + glib + nss + nspr + libdrm + libGL + libxkbcommon + libX11 + libXcursor + libXrandr + libXi + libXext + libXfixes + libXrender + libXtst + libxcrypt-legacy + gtk3 + alsa-lib + at-spi2-atk + at-spi2-core + cups + dbus + expat + pango + cairo + ]; + + extraInstallCommands = '' + mkdir -p $out/share/applications + cat > $out/share/applications/${pname}.desktop < building '/nix/store/8q029crhzkqw1vqvjbnxvmpgpwfr9sk1-pcbu-desktop-3.2.3-fhsenv-rootfs.drv' +pcbu-desktop-3.2.3-fhsenv-rootfs> structuredAttrs is enabled +pcbu-desktop-3.2.3-fhsenv-rootfs> Warning: Schema ?org.gnome.system.locale? has path ?/system/locale/?. Paths starting with ?/apps/?, ?/desktop/? or ?/system/? are deprecated. +pcbu-desktop-3.2.3-fhsenv-rootfs> Warning: Schema ?org.gnome.system.proxy? has path ?/system/proxy/?. Paths starting with ?/apps/?, ?/desktop/? or ?/system/? are deprecated. +pcbu-desktop-3.2.3-fhsenv-rootfs> Warning: Schema ?org.gnome.system.proxy.http? has path ?/system/proxy/http/?. Paths starting with ?/apps/?, ?/desktop/? or ?/system/? are deprecated. +pcbu-desktop-3.2.3-fhsenv-rootfs> Warning: Schema ?org.gnome.system.proxy.https? has path ?/system/proxy/https/?. Paths starting with ?/apps/?, ?/desktop/? or ?/system/? are deprecated. +pcbu-desktop-3.2.3-fhsenv-rootfs> Warning: Schema ?org.gnome.system.proxy.ftp? has path ?/system/proxy/ftp/?. Paths starting with ?/apps/?, ?/desktop/? or ?/system/? are deprecated. +pcbu-desktop-3.2.3-fhsenv-rootfs> Warning: Schema ?org.gnome.system.proxy.socks? has path ?/system/proxy/socks/?. Paths starting with ?/apps/?, ?/desktop/? or ?/system/? are deprecated. +pcbu-desktop-3.2.3-bwrap> building '/nix/store/6pzpm3vzia2jjfjizh8yx8v1n8l9apnr-pcbu-desktop-3.2.3-bwrap.drv' +pcbu-desktop> building '/nix/store/9jrq44m27r427rfxvbn3ym7b4y6hnnha-pcbu-desktop-3.2.3.drv' \ No newline at end of file