diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-03-23 18:57:01 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-03-23 19:20:24 -0500 |
| commit | 8e3d3b5328c0dbeeb1612f81efe051251c3c28c9 (patch) | |
| tree | 77091b95d9bb6f98146ea0615502197fe6780b96 /pkgs | |
| parent | 7833436098a341c1296faba17a7839690aa0702a (diff) | |
| download | nixpkgs-8e3d3b5328c0dbeeb1612f81efe051251c3c28c9.tar nixpkgs-8e3d3b5328c0dbeeb1612f81efe051251c3c28c9.tar.gz nixpkgs-8e3d3b5328c0dbeeb1612f81efe051251c3c28c9.tar.bz2 nixpkgs-8e3d3b5328c0dbeeb1612f81efe051251c3c28c9.tar.lz nixpkgs-8e3d3b5328c0dbeeb1612f81efe051251c3c28c9.tar.xz nixpkgs-8e3d3b5328c0dbeeb1612f81efe051251c3c28c9.tar.zst nixpkgs-8e3d3b5328c0dbeeb1612f81efe051251c3c28c9.zip | |
Revert "sddm: propagate qtbase input"
This reverts commit 3de6ccd5b21e391c4fa324c94dd150e331a8474e.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/display-managers/sddm/default.nix | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index 019d3e97a6f..9fd56a49b5f 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, makeQtWrapper, fetchFromGitHub, fetchpatch +{ stdenv, makeQtWrapper, fetchFromGitHub, fetchpatch , cmake, extra-cmake-modules, pkgconfig, libxcb, libpthreadstubs, lndir , libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd , themes @@ -28,13 +28,10 @@ let nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qttools ]; buildInputs = [ - libxcb libpthreadstubs libXdmcp libXau pam systemd - qtbase qtdeclarative + libxcb libpthreadstubs libXdmcp libXau qtbase pam systemd ]; - propagatedUserEnvPkgs = builtins.map lib.getBin [ - qtbase qtdeclarative - ]; + propagatedBuildInputs = [ qtdeclarative ]; cmakeFlags = [ "-DCONFIG_FILE=/etc/sddm.conf" @@ -83,21 +80,6 @@ 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 - makeQtWrapper "$unwrapped/bin/sddm" "$out/bin/sddm" mkdir -p "$out/share/sddm" |