From 35586e4eecc5f9f5f6021fbd7662ac848c2faa92 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Wed, 13 Mar 2024 05:42:23 -0400 Subject: [PATCH] qdirstat: migrate to by-name --- .../default.nix => by-name/qd/qdirstat/package.nix} | 8 ++++---- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 4 insertions(+), 6 deletions(-) rename pkgs/{applications/misc/qdirstat/default.nix => by-name/qd/qdirstat/package.nix} (90%) diff --git a/pkgs/applications/misc/qdirstat/default.nix b/pkgs/by-name/qd/qdirstat/package.nix similarity index 90% rename from pkgs/applications/misc/qdirstat/default.nix rename to pkgs/by-name/qd/qdirstat/package.nix index 3cf201db480b..f77cfcd47971 100644 --- a/pkgs/applications/misc/qdirstat/default.nix +++ b/pkgs/by-name/qd/qdirstat/package.nix @@ -1,6 +1,6 @@ -{ lib, fetchFromGitHub, qmake +{ lib, fetchFromGitHub, libsForQt5 , coreutils, xdg-utils, bash -, makeWrapper, perlPackages, mkDerivation }: +, makeWrapper, perlPackages }: let pname = "qdirstat"; @@ -14,10 +14,10 @@ let }; in -mkDerivation { +libsForQt5.mkDerivation { inherit pname version src; - nativeBuildInputs = [ qmake makeWrapper ]; + nativeBuildInputs = [ libsForQt5.qmake makeWrapper ]; buildInputs = [ perlPackages.perl ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bab08f433b80..b9e2cfff56b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34427,8 +34427,6 @@ with pkgs; eiskaltdcpp = libsForQt5.callPackage ../applications/networking/p2p/eiskaltdcpp { }; - qdirstat = libsForQt5.callPackage ../applications/misc/qdirstat { }; - qemu = callPackage ../applications/virtualization/qemu { inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Hypervisor vmnet; inherit (darwin.stubs) rez setfile;