From b2ec9599373c7e0f5428694c5712c8fc0be06264 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Thu, 14 Mar 2024 09:35:13 +0100
Subject: Load of updates and module simplification

---
 pkgs/default.nix                | 8 ++++++++
 pkgs/stardict/wrapper.nix       | 5 ++---
 pkgs/theme/delft-icon-theme.nix | 3 +--
 pkgs/theme/myswaylock.sh        | 4 ----
 4 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/default.nix b/pkgs/default.nix
index 38ce6b8..dc4dcae 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -25,4 +25,12 @@ final: prev: {
   #zigbee2mqtt = prev.zigbee2mqtt.overrideAttrs (oldAttrs: {
   #  npmInstallFlags = ["--no-optional"]; # Fix cross build
   #});
+  flac1_3 = prev.flac.overrideAttrs {
+    version = "1.3.4";
+    src = final.fetchurl {
+      url = "http://downloads.xiph.org/releases/flac/flac-1.3.4.tar.xz";
+      hash = "sha256-j/BgfnWjIt181uxI9PIlRxQEricw0OqUUSexNVFV5zc=";
+    };
+    outputs = ["out"];
+  };
 }
diff --git a/pkgs/stardict/wrapper.nix b/pkgs/stardict/wrapper.nix
index e99fa01..98ee814 100644
--- a/pkgs/stardict/wrapper.nix
+++ b/pkgs/stardict/wrapper.nix
@@ -1,5 +1,4 @@
 {
-  lib,
   stdenv,
   makeBinaryWrapper,
   stardict,
@@ -36,9 +35,9 @@ with stardict; let
     '';
 
     passthru.withDictionaries = dicts:
-      drv.overrideAttrs (oldAttrs: {
+      drv.overrideAttrs {
         dictionaries = dicts;
-      });
+      };
   };
 in
   drv
diff --git a/pkgs/theme/delft-icon-theme.nix b/pkgs/theme/delft-icon-theme.nix
index 1dcd904..fb0b6e3 100644
--- a/pkgs/theme/delft-icon-theme.nix
+++ b/pkgs/theme/delft-icon-theme.nix
@@ -1,13 +1,12 @@
 {
   lib,
-  stdenv,
   stdenvNoCC,
   fetchFromGitHub,
   gtk3,
   gnome-icon-theme,
   hicolor-icon-theme,
 }:
-stdenv.mkDerivation rec {
+stdenvNoCC.mkDerivation rec {
   pname = "delft-icon-theme";
   version = "1.15";
 
diff --git a/pkgs/theme/myswaylock.sh b/pkgs/theme/myswaylock.sh
index c204a57..18d6a6f 100755
--- a/pkgs/theme/myswaylock.sh
+++ b/pkgs/theme/myswaylock.sh
@@ -1,8 +1,4 @@
 #!/usr/bin/env bash
-
-# Switch to the US keyboard (to make sure that we have the correct one)
-swaymsg input type:keyboard xkb_layout us
-
 resolution="$(swaymsg -t get_outputs \
 	| jq -r '.[0].rect | [.width,.height] | join("x")')"
 case "$resolution" in
-- 
cgit v1.2.3