From 3e67cf4f01bc804bc8e4004864bdffed6c8abef1 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 10 Oct 2015 09:55:04 -0500 Subject: [PATCH] propagate frameworkintegration dependencies --- pkgs/desktops/plasma-5.4/breeze-qt5.nix | 26 +++++---------------- pkgs/desktops/plasma-5.4/oxygen.nix | 30 +++++-------------------- 2 files changed, 12 insertions(+), 44 deletions(-) diff --git a/pkgs/desktops/plasma-5.4/breeze-qt5.nix b/pkgs/desktops/plasma-5.4/breeze-qt5.nix index ea769b1e282..bf582f1a406 100644 --- a/pkgs/desktops/plasma-5.4/breeze-qt5.nix +++ b/pkgs/desktops/plasma-5.4/breeze-qt5.nix @@ -1,14 +1,6 @@ -{ plasmaPackage -, extra-cmake-modules -, frameworkintegration -, kcmutils -, kconfigwidgets -, kcoreaddons -, kdecoration -, kguiaddons -, ki18n -, kwindowsystem -, qtx11extras +{ plasmaPackage, extra-cmake-modules, frameworkintegration +, kcmutils, kconfigwidgets, kcoreaddons, kdecoration, kguiaddons +, ki18n, kwindowsystem, qtx11extras }: plasmaPackage { @@ -18,16 +10,10 @@ plasmaPackage { extra-cmake-modules ]; buildInputs = [ - frameworkintegration - kcmutils - kconfigwidgets - kcoreaddons - kdecoration - kguiaddons - ki18n - kwindowsystem - qtx11extras + kcmutils kconfigwidgets kcoreaddons kdecoration kguiaddons ki18n + kwindowsystem qtx11extras ]; + propagatedBuildInputs = [ frameworkintegration ]; cmakeFlags = [ "-DUSE_KDE4=OFF" ]; postInstall = '' wrapKDEProgram "$out/bin/breeze-settings5" diff --git a/pkgs/desktops/plasma-5.4/oxygen.nix b/pkgs/desktops/plasma-5.4/oxygen.nix index 5d221bc92b6..1dba49d93f4 100644 --- a/pkgs/desktops/plasma-5.4/oxygen.nix +++ b/pkgs/desktops/plasma-5.4/oxygen.nix @@ -1,16 +1,6 @@ -{ plasmaPackage -, extra-cmake-modules -, ki18n -, kcmutils -, kconfig -, kdecoration -, kguiaddons -, kwidgetsaddons -, kservice -, kcompletion -, frameworkintegration -, kwindowsystem -, qtx11extras +{ plasmaPackage, extra-cmake-modules, ki18n, kcmutils, kconfig +, kdecoration, kguiaddons, kwidgetsaddons, kservice, kcompletion +, frameworkintegration, kwindowsystem, qtx11extras }: plasmaPackage { @@ -19,18 +9,10 @@ plasmaPackage { extra-cmake-modules ]; buildInputs = [ - ki18n - kcmutils - kconfig - kdecoration - kguiaddons - kwidgetsaddons - kservice - kcompletion - frameworkintegration - kwindowsystem - qtx11extras + ki18n kcmutils kconfig kdecoration kguiaddons kwidgetsaddons + kservice kcompletion kwindowsystem qtx11extras ]; + propagatedBuildInputs = [ frameworkintegration ]; postInstall = '' wrapKDEProgram "$out/bin/oxygen-demo5" wrapKDEProgram "$out/bin/oxygen-settings5"