Unverified Commit 3b8ea39f authored by Gaétan Lepage's avatar Gaétan Lepage Committed by GitHub
Browse files

sddm themes: avoid .dev outputs propagation (#492336)

parents d860defc 378d1825

pkgs/by-name/ca/catppuccin-sddm-corners/package.nix

+6 −5
Original line number Diff line number Diff line
@@ -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 = ''

pkgs/by-name/ca/catppuccin-sddm/package.nix

+2 −6
Original line number Diff line number Diff line
@@ -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";

pkgs/by-name/el/elegant-sddm/package.nix

+2 −1
Original line number Diff line number Diff line
@@ -27,7 +27,8 @@ stdenvNoCC.mkDerivation { 


  dontWrapQtApps = true;

  propagatedBuildInputs = [

    kdePackages.qt5compat

    # avoid .dev outputs propagation

    kdePackages.qt5compat.out

  ];



  installPhase = ''

pkgs/by-name/no/nordic/package.nix

+3 −5
Original line number Diff line number Diff line
@@ -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 = {

pkgs/by-name/sd/sddm-chili-theme/package.nix

+3 −6
Original line number Diff line number Diff line
@@ -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 ];