sddm themes: avoid .dev outputs propagation (#492336)
This commit is contained in:
@@ -21,11 +21,12 @@ stdenvNoCC.mkDerivation {
|
||||
dontBuild = true;
|
||||
dontWrapQtApps = true;
|
||||
|
||||
propagatedUserEnvPkgs = with qt6; [
|
||||
qt5compat
|
||||
qtwayland
|
||||
qtquick3d
|
||||
qtsvg
|
||||
propagatedBuildInputs = with qt6; [
|
||||
# avoid .dev outputs propagation
|
||||
qt5compat.out
|
||||
qtwayland.out
|
||||
qtquick3d.out
|
||||
qtsvg.out
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -35,7 +35,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
kdePackages.qtsvg
|
||||
# avoid .dev outputs propagation
|
||||
kdePackages.qtsvg.out
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
@@ -91,11 +92,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
mkdir -p $out/nix-support
|
||||
echo ${kdePackages.qtsvg} >> $out/nix-support/propagated-user-env-packages
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Soothing pastel theme for SDDM";
|
||||
homepage = "https://github.com/catppuccin/sddm";
|
||||
|
||||
@@ -27,7 +27,8 @@ stdenvNoCC.mkDerivation {
|
||||
|
||||
dontWrapQtApps = true;
|
||||
propagatedBuildInputs = [
|
||||
kdePackages.qt5compat
|
||||
# avoid .dev outputs propagation
|
||||
kdePackages.qt5compat.out
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -149,13 +149,11 @@ stdenvNoCC.mkDerivation {
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
# Propagate sddm theme dependencies to user env otherwise sddm
|
||||
# does not find them. Putting them in buildInputs is not enough.
|
||||
|
||||
mkdir -p $sddm/nix-support
|
||||
|
||||
printWords ${kdePackages.breeze-icons} ${kdePackages.libplasma} ${kdePackages.plasma-workspace} \
|
||||
>> $sddm/nix-support/propagated-user-env-packages
|
||||
# avoid .dev outputs propagation
|
||||
printWords ${kdePackages.breeze-icons.out} ${kdePackages.libplasma.out} ${kdePackages.plasma-workspace.out} \
|
||||
>> $sddm/nix-support/propagated-build-inputs
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -30,7 +30,9 @@ stdenv.mkDerivation {
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
libsForQt5.qtgraphicaleffects
|
||||
# avoid .dev outputs propagation
|
||||
libsForQt5.qtgraphicaleffects.out
|
||||
libsForQt5.qtquickcontrols.out
|
||||
];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
@@ -43,11 +45,6 @@ stdenv.mkDerivation {
|
||||
mv * $out/share/sddm/themes/chili/
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
mkdir -p $out/nix-support
|
||||
|
||||
echo ${libsForQt5.qtgraphicaleffects} >> $out/nix-support/propagated-user-env-packages
|
||||
'';
|
||||
meta = {
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = with lib.maintainers; [ sents ];
|
||||
|
||||
@@ -20,7 +20,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
buildInputs = with libsForQt5.qt5; [ qtgraphicaleffects ];
|
||||
propagatedBuildInputs = [
|
||||
# avoid .dev outputs propagation
|
||||
libsForQt5.qtgraphicaleffects.out
|
||||
];
|
||||
|
||||
installPhase =
|
||||
let
|
||||
|
||||
@@ -16,12 +16,15 @@ stdenv.mkDerivation {
|
||||
hash = "sha256-moLgBFR+BgoiEBzV3y/LA6JZfLHrG1weL1+h8LN9ztA=";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs = with kdePackages; [
|
||||
breeze-icons
|
||||
kdeclarative
|
||||
dontWrapQtApps = true;
|
||||
|
||||
propagatedBuildInputs = with kdePackages; [
|
||||
# avoid .dev outputs propagation
|
||||
qt5compat.out
|
||||
kirigami
|
||||
libplasma
|
||||
plasma-workspace
|
||||
libplasma.out
|
||||
plasma5support.out
|
||||
plasma-workspace.out
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -43,12 +43,13 @@ lib.checkListOfEnum "where-is-my-sddm-theme: variant" validVariants variants
|
||||
hash = "sha256-+R0PX84SL2qH8rZMfk3tqkhGWPR6DpY1LgX9bifNYCg=";
|
||||
};
|
||||
|
||||
propagatedUserEnvPkgs =
|
||||
propagatedBuildInputs =
|
||||
[ ]
|
||||
++ lib.optionals (lib.elem "qt5" variants) [ libsForQt5.qtgraphicaleffects ]
|
||||
# avoid .dev outputs propagation
|
||||
++ lib.optionals (lib.elem "qt6" variants) [
|
||||
qt6.qt5compat
|
||||
qt6.qtsvg
|
||||
qt6.qt5compat.out
|
||||
qt6.qtsvg.out
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
|
||||
Reference in New Issue
Block a user