diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index f4f5e95c8ba6..6492b9c1684e 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -3,41 +3,41 @@ callPackage, runCommand, wrapQtAppsHook, - unwrapped ? callPackage ./unwrapped.nix { }, + sddm-unwrapped, extraPackages ? [ ], }: runCommand "sddm-wrapped" { - inherit (unwrapped) version outputs; + inherit (sddm-unwrapped) version outputs; - buildInputs = unwrapped.buildInputs ++ extraPackages; + buildInputs = sddm-unwrapped.buildInputs ++ extraPackages; nativeBuildInputs = [ wrapQtAppsHook ]; strictDeps = true; passthru = { - inherit unwrapped; - inherit (unwrapped.passthru) tests; + unwrapped = sddm-unwrapped; + inherit (sddm-unwrapped.passthru) tests; }; - meta = unwrapped.meta; + meta = sddm-unwrapped.meta; } '' mkdir -p $out/bin - cd ${unwrapped} + cd ${sddm-unwrapped} for i in *; do if [ "$i" == "bin" ]; then continue fi - ln -s ${unwrapped}/$i $out/$i + ln -s ${sddm-unwrapped}/$i $out/$i done for i in bin/*; do - makeQtWrapper ${unwrapped}/$i $out/$i --set SDDM_GREETER_DIR $out/bin + makeQtWrapper ${sddm-unwrapped}/$i $out/$i --set SDDM_GREETER_DIR $out/bin done mkdir -p $man - ln -s ${lib.getMan unwrapped}/* $man/ + ln -s ${lib.getMan sddm-unwrapped}/* $man/ '' diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index 1f47e74579e3..c13b2585c3fc 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -138,6 +138,7 @@ makeScopeWithSplicing' { callPackage ../development/libraries/sailfish-access-control-plugin { }; + sddm-unwrapped = kdePackages.callPackage ../applications/display-managers/sddm/unwrapped.nix { }; sddm = kdePackages.callPackage ../applications/display-managers/sddm { }; sierra-breeze-enhanced =