public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sddm: propagate qtbase input

Browse Source
This commit is contained in:
Thomas Tuegel 2017-03-22 07:14:59 -05:00
parent 7aee677a10
commit 3de6ccd5b2
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/applications/display-managers/sddm/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, makeQtWrapper, fetchFromGitHub, fetchpatch { stdenv, lib, makeQtWrapper, fetchFromGitHub, fetchpatch
, cmake, extra-cmake-modules, pkgconfig, libxcb, libpthreadstubs, lndir , cmake, extra-cmake-modules, pkgconfig, libxcb, libpthreadstubs, lndir
, libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd , libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd
, themes , themes
@ -28,10 +28,13 @@ let
nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qttools ]; nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qttools ];
buildInputs = [ buildInputs = [
libxcb libpthreadstubs libXdmcp libXau qtbase pam systemd libxcb libpthreadstubs libXdmcp libXau pam systemd
qtbase qtdeclarative
]; ];
propagatedBuildInputs = [ qtdeclarative ]; propagatedUserEnvPkgs = builtins.map lib.getBin [
qtbase qtdeclarative
];
cmakeFlags = [ cmakeFlags = [
"-DCONFIG_FILE=/etc/sddm.conf" "-DCONFIG_FILE=/etc/sddm.conf"
@ -80,6 +83,21 @@ stdenv.mkDerivation {
installPhase = '' installPhase = ''
runHook preInstall 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
makeQtWrapper "$unwrapped/bin/sddm" "$out/bin/sddm" makeQtWrapper "$unwrapped/bin/sddm" "$out/bin/sddm"
mkdir -p "$out/share/sddm" mkdir -p "$out/share/sddm"