diff --git a/pkgs/patched/alsa-ucm-conf/default.nix b/pkgs/additional/alsa-ucm-conf-sane/default.nix similarity index 100% rename from pkgs/patched/alsa-ucm-conf/default.nix rename to pkgs/additional/alsa-ucm-conf-sane/default.nix diff --git a/pkgs/patched/alsa-ucm-conf/ucm2/PinePhone/HiFi.conf b/pkgs/additional/alsa-ucm-conf-sane/ucm2/PinePhone/HiFi.conf similarity index 100% rename from pkgs/patched/alsa-ucm-conf/ucm2/PinePhone/HiFi.conf rename to pkgs/additional/alsa-ucm-conf-sane/ucm2/PinePhone/HiFi.conf diff --git a/pkgs/patched/alsa-ucm-conf/ucm2/PinePhone/PinePhone.conf b/pkgs/additional/alsa-ucm-conf-sane/ucm2/PinePhone/PinePhone.conf similarity index 100% rename from pkgs/patched/alsa-ucm-conf/ucm2/PinePhone/PinePhone.conf rename to pkgs/additional/alsa-ucm-conf-sane/ucm2/PinePhone/PinePhone.conf diff --git a/pkgs/patched/alsa-ucm-conf/ucm2/PinePhone/VoiceCall.conf b/pkgs/additional/alsa-ucm-conf-sane/ucm2/PinePhone/VoiceCall.conf similarity index 100% rename from pkgs/patched/alsa-ucm-conf/ucm2/PinePhone/VoiceCall.conf rename to pkgs/additional/alsa-ucm-conf-sane/ucm2/PinePhone/VoiceCall.conf diff --git a/pkgs/patched/alsa-ucm-conf/ucm2/ucm.conf b/pkgs/additional/alsa-ucm-conf-sane/ucm2/ucm.conf similarity index 100% rename from pkgs/patched/alsa-ucm-conf/ucm2/ucm.conf rename to pkgs/additional/alsa-ucm-conf-sane/ucm2/ucm.conf diff --git a/pkgs/default.nix b/pkgs/default.nix index 164b027b..09dbfe01 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -19,7 +19,7 @@ let sane-lib = import ../modules/lib final'; ### ADDITIONAL PACKAGES - alsa-ucm-conf-sane = callPackage ./patched/alsa-ucm-conf { inherit (unpatched) alsa-ucm-conf; }; + alsa-ucm-conf-sane = callPackage ./additional/alsa-ucm-conf-sane { }; bonsai = unpatched.bonsai or (callPackage ./additional/bonsai { }); bootpart-uefi-x86_64 = callPackage ./additional/bootpart-uefi-x86_64 { }; browserpass-extension = callPackage ./additional/browserpass-extension { }; @@ -69,7 +69,7 @@ let # XXX patching this is... really costly. # prefer to set ALSA_CONFIG_UCM2 = "${pkgs.alsa-ucm-conf-sane}/share/alsa/ucm2" if possible instead. # alsa-project = unpatched.alsa-project.overrideScope' (sself: ssuper: { - # alsa-ucm-conf = sself.callPackage ./patched/alsa-ucm-conf { inherit (ssuper) alsa-ucm-conf; }; + # alsa-ucm-conf = sself.callPackage ./additional/alsa-ucm-conf-sane { inherit (ssuper) alsa-ucm-conf; }; # }); browserpass = callPackage ./patched/browserpass { inherit (unpatched) browserpass; };