diff options
| author | worldofpeace <worldofpeace@users.noreply.github.com> | 2019-04-12 00:15:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-12 00:15:00 -0400 |
| commit | e3cc0e6815ab6da02cb95be37a3b6fa475384818 (patch) | |
| tree | 9267daf97b17acf2c9839907e126e9ca2ba71546 | |
| parent | b7533ce2818b41f5f8cf1f8674b7ff4ef8e88ebc (diff) | |
| parent | 60a9e6177d8551fc22731efd71616de6e3debdae (diff) | |
| download | nixpkgs-e3cc0e6815ab6da02cb95be37a3b6fa475384818.tar nixpkgs-e3cc0e6815ab6da02cb95be37a3b6fa475384818.tar.gz nixpkgs-e3cc0e6815ab6da02cb95be37a3b6fa475384818.tar.bz2 nixpkgs-e3cc0e6815ab6da02cb95be37a3b6fa475384818.tar.lz nixpkgs-e3cc0e6815ab6da02cb95be37a3b6fa475384818.tar.xz nixpkgs-e3cc0e6815ab6da02cb95be37a3b6fa475384818.tar.zst nixpkgs-e3cc0e6815ab6da02cb95be37a3b6fa475384818.zip | |
Merge pull request #58627 from dtzWill/update/sddm-0.18.1
sddm: 0.18.0 -> 0.18.1
| -rw-r--r-- | pkgs/applications/display-managers/sddm/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index 3de4067f55d..b5d32493003 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -4,7 +4,7 @@ }: let - version = "0.18.0"; + version = "0.18.1"; in mkDerivation rec { name = "sddm-${version}"; @@ -13,7 +13,7 @@ in mkDerivation rec { owner = "sddm"; repo = "sddm"; rev = "v${version}"; - sha256 = "16xnm02iqgy4hydzd6my0widq981glbazbhxnihhclgsaczh8mfq"; + sha256 = "0an1zafz0yhxd9jgd3gzdwmaw5f9vs4c924q56lp2yxxddbmzjcq"; }; patches = [ @@ -41,11 +41,11 @@ in mkDerivation rec { # not supported anyway. "-DUID_MIN=1000" "-DUID_MAX=29999" - ]; - preConfigure = '' - export cmakeFlags="$cmakeFlags -DQT_IMPORTS_DIR=$out/$qtQmlPrefix -DCMAKE_INSTALL_SYSCONFDIR=$out/etc -DSYSTEMD_SYSTEM_UNIT_DIR=$out/lib/systemd/system" - ''; + "-DQT_IMPORTS_DIR=${placeholder "out"}/${qtbase.qtQmlPrefix}" + "-DCMAKE_INSTALL_SYSCONFDIR=${placeholder "out"}/etc" + "-DSYSTEMD_SYSTEM_UNIT_DIR=${placeholder "out"}/lib/systemd/system" + ]; postInstall = '' # remove empty scripts |