diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-03-24 10:39:30 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-03-24 10:39:30 -0500 |
| commit | 39fdbbb71e7ffbb7bea328530dbede9e092b35e2 (patch) | |
| tree | d51fd970d9812b154f6e53934a804e114c64fbdd /pkgs | |
| parent | 26fe842ec58f216b7a379e0237e72a4d97ea281c (diff) | |
| parent | 352e335f3d643b84f34d5c102a4828712924a267 (diff) | |
| download | nixpkgs-39fdbbb71e7ffbb7bea328530dbede9e092b35e2.tar nixpkgs-39fdbbb71e7ffbb7bea328530dbede9e092b35e2.tar.gz nixpkgs-39fdbbb71e7ffbb7bea328530dbede9e092b35e2.tar.bz2 nixpkgs-39fdbbb71e7ffbb7bea328530dbede9e092b35e2.tar.lz nixpkgs-39fdbbb71e7ffbb7bea328530dbede9e092b35e2.tar.xz nixpkgs-39fdbbb71e7ffbb7bea328530dbede9e092b35e2.tar.zst nixpkgs-39fdbbb71e7ffbb7bea328530dbede9e092b35e2.zip | |
Merge branch 'master--plasma-5'
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/display-managers/sddm/default.nix | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index 9fd56a49b5f..f675febafb5 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -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" |