From 14024e8ef1874e6ce080fe01b88891f8a420da9b Mon Sep 17 00:00:00 2001 From: awwpotato Date: Sat, 10 May 2025 20:59:29 -0700 Subject: [PATCH 1/4] krusader: use callPackage --- .../file-managers/krusader/default.nix | 17 ++++------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/file-managers/krusader/default.nix b/pkgs/applications/file-managers/krusader/default.nix index cd3dc3be2b47..a7fe7112ad47 100644 --- a/pkgs/applications/file-managers/krusader/default.nix +++ b/pkgs/applications/file-managers/krusader/default.nix @@ -3,17 +3,8 @@ stdenv, fetchurl, extra-cmake-modules, - kdoctools, - karchive, - kconfig, - kcrash, - kguiaddons, - kparts, - kwindowsystem, cmake, - wrapQtAppsHook, - qt5compat, - kstatusnotifieritem, + kdePackages, }: stdenv.mkDerivation rec { @@ -28,11 +19,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake extra-cmake-modules - kdoctools - wrapQtAppsHook + kdePackages.kdoctools + kdePackages.wrapQtAppsHook ]; - propagatedBuildInputs = [ + propagatedBuildInputs = with kdePackages; [ karchive kconfig kcrash diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ad1bacc7f5e4..cb1dc0c47f05 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1528,7 +1528,7 @@ with pkgs; inherit (libsForQt5) libqtpas wrapQtAppsHook; }; - krusader = kdePackages.callPackage ../applications/file-managers/krusader { }; + krusader = callPackage ../applications/file-managers/krusader { }; mc = callPackage ../applications/file-managers/mc { inherit (darwin) autoSignDarwinBinariesHook; From 42d2f64fc23f59b4e3279170ac67fd7490a9d5b7 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Sat, 10 May 2025 21:01:10 -0700 Subject: [PATCH 2/4] krusader: move to by-name --- .../krusader/default.nix => by-name/kr/krusader/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/file-managers/krusader/default.nix => by-name/kr/krusader/package.nix} (100%) diff --git a/pkgs/applications/file-managers/krusader/default.nix b/pkgs/by-name/kr/krusader/package.nix similarity index 100% rename from pkgs/applications/file-managers/krusader/default.nix rename to pkgs/by-name/kr/krusader/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cb1dc0c47f05..3ff7b7613ced 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1528,8 +1528,6 @@ with pkgs; inherit (libsForQt5) libqtpas wrapQtAppsHook; }; - krusader = callPackage ../applications/file-managers/krusader { }; - mc = callPackage ../applications/file-managers/mc { inherit (darwin) autoSignDarwinBinariesHook; }; From 0dca53864b950d5a4cdb09c0a5bb4caaa457c210 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Sat, 10 May 2025 21:01:37 -0700 Subject: [PATCH 3/4] mc: move to by-name --- .../mc/default.nix => by-name/mc/mc/package.nix} | 6 +++--- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-) rename pkgs/{applications/file-managers/mc/default.nix => by-name/mc/mc/package.nix} (95%) diff --git a/pkgs/applications/file-managers/mc/default.nix b/pkgs/by-name/mc/mc/package.nix similarity index 95% rename from pkgs/applications/file-managers/mc/default.nix rename to pkgs/by-name/mc/mc/package.nix index 4174e5bc82e7..76e563bbbb21 100644 --- a/pkgs/applications/file-managers/mc/default.nix +++ b/pkgs/by-name/mc/mc/package.nix @@ -17,7 +17,7 @@ libssh2, openssl, coreutils, - autoSignDarwinBinariesHook, + darwin, x11Support ? true, libX11, @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { # The preFixup hook rewrites the binary, which invaliates the code # signature. Add the fixup hook to sign the output. ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ - autoSignDarwinBinariesHook + darwin.autoSignDarwinBinariesHook ]; buildInputs = @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { homepage = "https://midnight-commander.org"; license = licenses.gpl3Plus; maintainers = with maintainers; [ sander ]; - platforms = with platforms; linux ++ darwin; + platforms = platforms.linux ++ platforms.darwin; mainProgram = "mc"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ff7b7613ced..a32c295c8ba3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1528,10 +1528,6 @@ with pkgs; inherit (libsForQt5) libqtpas wrapQtAppsHook; }; - mc = callPackage ../applications/file-managers/mc { - inherit (darwin) autoSignDarwinBinariesHook; - }; - vifm-full = vifm.override { mediaSupport = true; inherit lib udisks2 python3; From c523570c911679a8d31cfa8087c9d2be906b2c0b Mon Sep 17 00:00:00 2001 From: awwpotato Date: Sat, 10 May 2025 21:03:26 -0700 Subject: [PATCH 4/4] xfe: move to by-name --- .../xfe/default.nix => by-name/xf/xfe/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{applications/file-managers/xfe/default.nix => by-name/xf/xfe/package.nix} (100%) diff --git a/pkgs/applications/file-managers/xfe/default.nix b/pkgs/by-name/xf/xfe/package.nix similarity index 100% rename from pkgs/applications/file-managers/xfe/default.nix rename to pkgs/by-name/xf/xfe/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a32c295c8ba3..3e80b0e5c643 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1533,7 +1533,7 @@ with pkgs; inherit lib udisks2 python3; }; - xfe = callPackage ../applications/file-managers/xfe { + xfe = callPackage ../by-name/xf/xfe/package.nix { fox = fox_1_6; };