MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Revert "sddm: propagate qtbase input"

Browse source 
This reverts commit 3de6ccd5b2.
This commit is contained in:
Thomas Tuegel 2017-03-23 18:57:01 -05:00
parent 7833436098
commit 8e3d3b5328
No known key found for this signature in database
GPG key ID: 22CBF5249D4B4D59
1 changed files with 3 additions and 21 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, lib, makeQtWrapper, fetchFromGitHub, fetchpatch { stdenv, 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,13 +28,10 @@ let
nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qttools ]; nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qttools ];
buildInputs = [ buildInputs = [
libxcb libpthreadstubs libXdmcp libXau pam systemd libxcb libpthreadstubs libXdmcp libXau qtbase pam systemd
qtbase qtdeclarative
]; ];
propagatedUserEnvPkgs = builtins.map lib.getBin [ propagatedBuildInputs = [ qtdeclarative ];
qtbase qtdeclarative
];
cmakeFlags = [ cmakeFlags = [
"-DCONFIG_FILE=/etc/sddm.conf" "-DCONFIG_FILE=/etc/sddm.conf"
@ -83,21 +80,6 @@ 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"