From d9276ebdbdf3a482a8f0d873e0c3a5860953e13a Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Tue, 15 Jul 2025 08:58:16 -0500 Subject: [PATCH] doublecmd: refactor inherit statement --- pkgs/by-name/do/doublecmd/package.nix | 7 +++---- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/do/doublecmd/package.nix b/pkgs/by-name/do/doublecmd/package.nix index 12f1e693c23f..5b0cb1a690fd 100644 --- a/pkgs/by-name/do/doublecmd/package.nix +++ b/pkgs/by-name/do/doublecmd/package.nix @@ -8,8 +8,7 @@ glib, lazarus, libX11, - libqtpas, - wrapQtAppsHook, + libsForQt5, writableTmpDirAsHomeHook, }: @@ -28,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { fpc getopt lazarus - wrapQtAppsHook + libsForQt5.wrapQtAppsHook writableTmpDirAsHomeHook ]; @@ -36,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { dbus glib libX11 - libqtpas + libsForQt5.libqtpas ]; env.NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath finalAttrs.buildInputs}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f6cde488533..08d742fe4043 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1515,10 +1515,6 @@ with pkgs; ### APPLICATIONS/FILE-MANAGERS - doublecmd = callPackage ../by-name/do/doublecmd/package.nix { - inherit (libsForQt5) libqtpas wrapQtAppsHook; - }; - vifm-full = vifm.override { mediaSupport = true; inherit lib udisks2 python3;