diff --git a/packages/default.nix b/packages/default.nix index 38a355b..a22674a 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -3,7 +3,6 @@ final: prev: let pySmartDL = prev.callPackage ./development/python/pySmartDL {}; cfscrape = prev.callPackage ./development/python/cfscrape {}; - system_hotkey = prev.callPackage ./development/python/system_hotkey {}; discord-system-electron = prev.callPackage ./applications/networking/instant-messengers/discord { # Wayland # NOTE: electron under Wayland has no window titlebars @@ -11,8 +10,8 @@ let #extraStartupArgs = "--enable-features=UseOzonePlatform --ozone-platform=wayland --enable-features=WebRTCPipeWireCapturer"; }; wrapInSandbox = prev.callPackage ./sandbox.nix {}; -in { - key-mapper = prev.callPackage ./tools/games/key-mapper {}; +in { +key-mapper = prev.callPackage ./tools/games/key-mapper {}; vfio-isolate = prev.callPackage ./tools/virtualisation/vfio-isolate {}; mopidy-funkwhale = prev.callPackage ./applications/audio/mopidy/funkwhale.nix {}; # Not as clean as I hoped, but it works @@ -23,8 +22,8 @@ in { python3Packages = prev.python3Packages // { pySmartDL = pySmartDL; cfscrape = cfscrape; - system_hotkey = system_hotkey; }; + replaysorcery = prev.callPackage ./tools/games/replaysorcery {}; evdev-proxy = prev.callPackage ./tools/virtualisation/evdev-proxy {}; anime4k = prev.callPackage ./misc/video/anime4k {}; @@ -32,9 +31,6 @@ in { pySmartDL = pySmartDL; cfscrape = cfscrape; }; - superpaper = prev.callPackage ./applications/desktop/superpaper { - system_hotkey = system_hotkey; - }; discord-wrapped = wrapInSandbox { name = "discord"; package = prev.discord; @@ -120,8 +116,19 @@ in { }; }); }; - + swaync = prev.callPackage ./tools/desktop/swaync {}; + # TODO: Remove once NixOS has version 0.11.16 in their repos sublime-music-no-test = prev.callPackage ./applications/audio/sublime-music {}; + + # TODO: Remove once upstream has a new version tagged + kasts-git = prev.libsForQt5.kasts.overrideAttrs (old: { + src = builtins.fetchTarball { + url = "https://invent.kde.org/plasma-mobile/kasts/-/archive/master/kasts-master.tar.gz"; + sha256 = "1n7j4011hgscmjj728iyjgifpbnwc1sy32b5aw834n1vgxfkq00l"; + }; + + buildInputs = old.buildInputs ++ [ prev.taglib prev.libsForQt5.qtkeychain ]; + }); }