Unverified Commit 7ffbecde authored by K900's avatar K900 Committed by GitHub
Browse files

Merge pull request #327657 from K900/kirigami-hacks 

kdePackages.kirigami: hack to propagate qqc2-desktop-style
parents d24eef8b f6172353

pkgs/kde/frameworks/kirigami/default.nix

+25 −5
Original line number Diff line number Diff line 
{

  stdenv,

  mkKdeDerivation,

  qtsvg,

  qttools,

  qtdeclarative,

  qt5compat,

  qqc2-desktop-style,

}:

mkKdeDerivation {

# Kirigami has a runtime dependency on qqc2-desktop-style,

# which has a build time dependency on Kirigami.

# So, build qqc2-desktop-style against unwrapped Kirigami,

# and replace all the other Kirigami with a wrapper that

# propagates both Kirigami and qqc2-desktop-style.

# This is a hack, but what can you do.

let

  unwrapped = mkKdeDerivation {

    pname = "kirigami";



    extraNativeBuildInputs = [qtsvg qttools];

    extraBuildInputs = [qtdeclarative];

    extraPropagatedBuildInputs = [qt5compat];

  };

in stdenv.mkDerivation {

  pname = "kirigami-wrapped";

  inherit (unwrapped) version;



  propagatedBuildInputs = [ unwrapped qqc2-desktop-style ];



  dontUnpack = true;

  dontWrapQtApps = true;



  passthru = { inherit unwrapped; };

}

pkgs/kde/frameworks/qqc2-desktop-style/default.nix

+4 −1
Original line number Diff line number Diff line
@@ -2,10 +2,13 @@ 
  mkKdeDerivation,

  qtdeclarative,

  qttools,

  kirigami,

}:

mkKdeDerivation {

  pname = "qqc2-desktop-style";



  extraNativeBuildInputs = [qttools];

  extraBuildInputs = [qtdeclarative];

  extraBuildInputs = [qtdeclarative kirigami.unwrapped];



  excludeDependencies = ["kirigami"];

}

pkgs/kde/gear/filelight/default.nix

+0 −2
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
  mkKdeDerivation,

  kirigami,

  kquickcharts,

  qqc2-desktop-style,

}:

mkKdeDerivation {

  pname = "filelight";
@@ -10,7 +9,6 @@ mkKdeDerivation { 
  extraBuildInputs = [

    kirigami

    kquickcharts

    qqc2-desktop-style

  ];

  meta.mainProgram = "filelight";

}

pkgs/kde/gear/kalk/default.nix

+0 −2
Original line number Diff line number Diff line 
{

  mkKdeDerivation,

  qtdeclarative,

  qqc2-desktop-style,

  kirigami-addons,

  pkg-config,

  bison,
@@ -16,7 +15,6 @@ mkKdeDerivation { 
  extraNativeBuildInputs = [pkg-config bison flex];

  extraBuildInputs = [

    qtdeclarative

    qqc2-desktop-style

    kirigami-addons

    gmp

    mpfr

pkgs/kde/gear/kweather/default.nix

+1 −2
Original line number Diff line number Diff line
@@ -2,12 +2,11 @@ 
  mkKdeDerivation,

  qtsvg,

  qtcharts,

  qqc2-desktop-style,

  kholidays,

}:

mkKdeDerivation {

  pname = "kweather";



  extraBuildInputs = [qtsvg qtcharts qqc2-desktop-style kholidays];

  extraBuildInputs = [qtsvg qtcharts kholidays];

  meta.mainProgram = "kweather";

}