From 5c5f656c97d7d4e50cc933c7ad15fafbb7a75972 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Sat, 19 Apr 2025 20:05:21 -0700 Subject: [PATCH] dfilemanager: move to by-name --- .../df/dfilemanager/package.nix} | 22 ++++++++++--------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 12 insertions(+), 12 deletions(-) rename pkgs/{applications/file-managers/dfilemanager/default.nix => by-name/df/dfilemanager/package.nix} (66%) diff --git a/pkgs/applications/file-managers/dfilemanager/default.nix b/pkgs/by-name/df/dfilemanager/package.nix similarity index 66% rename from pkgs/applications/file-managers/dfilemanager/default.nix rename to pkgs/by-name/df/dfilemanager/package.nix index 44f2675f18d6..74d65f0ecc16 100644 --- a/pkgs/applications/file-managers/dfilemanager/default.nix +++ b/pkgs/by-name/df/dfilemanager/package.nix @@ -1,15 +1,13 @@ { lib, - mkDerivation, + stdenv, fetchFromGitHub, cmake, + libsForQt5, file, - qtbase, - qttools, - solid, }: -mkDerivation { +stdenv.mkDerivation { pname = "dfilemanager"; version = "unstable-2021-02-20"; @@ -17,15 +15,18 @@ mkDerivation { owner = "probonopd"; repo = "dfilemanager"; rev = "61179500a92575e05cf9a71d401c388726bfd73d"; - sha256 = "sha256-BHd2dZDVxy82vR6PyXIS5M6zBGJ4bQfOhdBCdOww4kc="; + hash = "sha256-BHd2dZDVxy82vR6PyXIS5M6zBGJ4bQfOhdBCdOww4kc="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + libsForQt5.wrapQtAppsHook + ]; buildInputs = [ - qtbase - qttools + libsForQt5.qtbase + libsForQt5.qttools + libsForQt5.solid file - solid ]; cmakeFlags = [ "-DQT5BUILD=true" ]; @@ -36,5 +37,6 @@ mkDerivation { mainProgram = "dfm"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; + maintainers = [ ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 548a6291147d..cda54c7bcf27 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13982,8 +13982,6 @@ with pkgs; dfasma = libsForQt5.callPackage ../applications/audio/dfasma { }; - dfilemanager = libsForQt5.callPackage ../applications/file-managers/dfilemanager { }; - direwolf = callPackage ../applications/radio/direwolf { hamlib = hamlib_4; };