sddm: fix wrapper
When I reduced the closure size, I broke the built-in theme. When I reverted that fix, the built-in theme worked but the Plasma theme was broken. Now the wrapper is fixed so that both themes work.
This commit is contained in:
parent
27ba56f1e0
commit
e44cd00c2a
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, makeQtWrapper, fetchFromGitHub, fetchpatch
|
||||
{ stdenv, lib, makeQtWrapper, fetchFromGitHub, fetchpatch
|
||||
, cmake, extra-cmake-modules, pkgconfig, libxcb, libpthreadstubs, lndir
|
||||
, libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd
|
||||
, themes
|
||||
|
@ -28,10 +28,12 @@ let
|
|||
nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qttools ];
|
||||
|
||||
buildInputs = [
|
||||
libxcb libpthreadstubs libXdmcp libXau qtbase pam systemd
|
||||
libxcb libpthreadstubs libXdmcp libXau pam systemd
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ qtdeclarative ];
|
||||
propagatedBuildInputs = [
|
||||
qtbase qtdeclarative
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCONFIG_FILE=/etc/sddm.conf"
|
||||
|
@ -80,6 +82,22 @@ stdenv.mkDerivation {
|
|||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
propagated=
|
||||
for i in $unwrapped $themes; do
|
||||
findInputs $i propagated propagated-user-env-packages
|
||||
if [ -z "$crossConfig" ]; then
|
||||
findInputs $i propagated propagated-native-build-inputs
|
||||
else
|
||||
findInputs $i propagated propagated-build-inputs
|
||||
fi
|
||||
done
|
||||
|
||||
for pkg in $propagated; do
|
||||
addToSearchPath RUNTIME_XDG_DATA_DIRS "$pkg/share"
|
||||
addToSearchPath RUNTIME_XDG_CONFIG_DIRS "$pkg/etc/xdg"
|
||||
done
|
||||
|
||||
mkdir -p "$out/bin"
|
||||
makeQtWrapper "$unwrapped/bin/sddm" "$out/bin/sddm"
|
||||
|
||||
mkdir -p "$out/share/sddm"
|
||||
|
|
Loading…
Reference in a new issue