From bc9245374557f5aeb5b3903f9e0f801d599dcbc5 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 13 Jun 2023 00:31:36 +0200 Subject: 5pkgs: flakeify --- 5pkgs/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/5pkgs/default.nix b/5pkgs/default.nix index c057d1470..eef820743 100644 --- a/5pkgs/default.nix +++ b/5pkgs/default.nix @@ -1,6 +1,3 @@ -let - unstable = (import {}).pkgs; -in self: super: with super.lib; with builtins; let # This callPackage will try to detect obsolete overrides. @@ -23,7 +20,7 @@ with super.lib; with builtins; let (filterAttrs (_: eq "directory") (readDir path)); in { - quodlibet = super.pkgs.lib.overrideDerivation super.quodlibet (old: { + quodlibet = verrideDerivation super.quodlibet (old: { doCheck = false; # 1 error because of warnings (possibly upstream) patches = [ ./custom/quodlibet/single-digit-discnumber.patch ./custom/quodlibet/remove-override-warning.patch ]; @@ -45,7 +42,7 @@ in { alsa-hdspmixer = callPackage ./custom/alsa-tools { alsaToolTarget="hdspmixer";}; alsa-hdsploader = callPackage ./custom/alsa-tools { alsaToolTarget="hdsploader";}; brother_ql_web = (builtins.getFlake "github:makefu/brother_ql_web?rev=a3f8625f48111da8cd6f8e562c966cdca445b82d").packages.x86_64-linux.default; - qcma = super.pkgs.libsForQt5.callPackage ./custom/qcma { }; + qcma = super.libsForQt5.callPackage ./custom/qcma { }; inherit (callPackage ./devpi {}) devpi-web ; jellyfin = unstable.jellyfin; jellyfin-web = unstable.jellyfin-web; -- cgit v1.2.3