feat(flake): remove libreoffice version freeze & downgrade vlc

cterence · Feb 9, 2025 · b531aa4 · b531aa4
1 parent 90215db
commit b531aa4
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 15 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -3,10 +3,11 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    # FIXME: while libreoffice fails to build
-    nixpkgs-dc460ec7.url = "github:nixos/nixpkgs/dc460ec76cbff0e66e269457d7b728432263166c";
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
 
+    # FIXME: https://www.reddit.com/r/VLC/comments/1dexl6y/some_opus_audio_tracks_to_videos_not_playing_in/
+    nixpkgs-vlc3-0-20.url = "github:nixos/nixpkgs/62b3c73a4e0e9ddc92de1c165492fce00c5027c4";
+
     baywatch = {
       url = "github:padok-team/baywatch/fix/sort-fzf";
       inputs.nixpkgs.follows = "nixpkgs";

diff --git a/hosts/framework/configuration.nix b/hosts/framework/configuration.nix
@@ -32,7 +32,7 @@
 
   nixpkgs.overlays = [
     outputs.overlays.additions
-    outputs.overlays.pkgs-dc460ec7
+    outputs.overlays.pkgs-vlc3-0-20
   ];
 
   # Workaround for gdm

diff --git a/hosts/stronghold/configuration.nix b/hosts/stronghold/configuration.nix
@@ -26,7 +26,7 @@
 
   nixpkgs.overlays = [
     outputs.overlays.additions
-    outputs.overlays.pkgs-dc460ec7
+    outputs.overlays.pkgs-vlc3-0-20
   ];
 
   networking = {

diff --git a/hosts/t14s/configuration.nix b/hosts/t14s/configuration.nix
@@ -21,7 +21,7 @@
 
   nixpkgs.overlays = [
     outputs.overlays.additions
-    outputs.overlays.pkgs-dc460ec7
+    outputs.overlays.pkgs-vlc3-0-20
   ];
 
   home-manager = {

diff --git a/modules/system/desktop.nix b/modules/system/desktop.nix
@@ -40,7 +40,7 @@
       kitty
       libguestfs
       nfs-utils
-      dc460ec7.libreoffice-fresh
+      libreoffice-fresh
       nvtopPackages.amd
       obsidian
       qemu
@@ -49,7 +49,7 @@
       todoist-electron
       undollar
       virt-manager
-      vlc
+      vlc3-0-20.vlc
       wireshark
       wl-clipboard
       zed-editor

diff --git a/overlays/default.nix b/overlays/default.nix
@@ -15,8 +15,8 @@
 
   # When applied, the unstable nixpkgs set (declared in the flake inputs) will
   # be accessible through 'pkgs.unstable'
-  pkgs-dc460ec7 = final: _prev: {
-    dc460ec7 = import inputs.nixpkgs-dc460ec7 {
+  pkgs-vlc3-0-20 = final: _prev: {
+    vlc3-0-20 = import inputs.nixpkgs-vlc3-0-20 {
       inherit (final) system;
       config.allowUnfree = true;
     };