Merge pull request #58627 from dtzWill/update/sddm-0.18.1

sddm: 0.18.0 -> 0.18.1
This commit is contained in:
worldofpeace 2019-04-12 00:15:00 -04:00 committed by GitHub
commit e3cc0e6815
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -4,7 +4,7 @@
}: }:
let let
version = "0.18.0"; version = "0.18.1";
in mkDerivation rec { in mkDerivation rec {
name = "sddm-${version}"; name = "sddm-${version}";
@ -13,7 +13,7 @@ in mkDerivation rec {
owner = "sddm"; owner = "sddm";
repo = "sddm"; repo = "sddm";
rev = "v${version}"; rev = "v${version}";
sha256 = "16xnm02iqgy4hydzd6my0widq981glbazbhxnihhclgsaczh8mfq"; sha256 = "0an1zafz0yhxd9jgd3gzdwmaw5f9vs4c924q56lp2yxxddbmzjcq";
}; };
patches = [ patches = [
@ -41,11 +41,11 @@ in mkDerivation rec {
# not supported anyway. # not supported anyway.
"-DUID_MIN=1000" "-DUID_MIN=1000"
"-DUID_MAX=29999" "-DUID_MAX=29999"
];
preConfigure = '' "-DQT_IMPORTS_DIR=${placeholder "out"}/${qtbase.qtQmlPrefix}"
export cmakeFlags="$cmakeFlags -DQT_IMPORTS_DIR=$out/$qtQmlPrefix -DCMAKE_INSTALL_SYSCONFDIR=$out/etc -DSYSTEMD_SYSTEM_UNIT_DIR=$out/lib/systemd/system" "-DCMAKE_INSTALL_SYSCONFDIR=${placeholder "out"}/etc"
''; "-DSYSTEMD_SYSTEM_UNIT_DIR=${placeholder "out"}/lib/systemd/system"
];
postInstall = '' postInstall = ''
# remove empty scripts # remove empty scripts