public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

plasma54: propagate packages to user profile

Browse Source
This commit is contained in:
Thomas Tuegel 2015-10-17 16:52:46 -05:00
parent 2386bd7c61
commit 5df5e1f165
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/services/x11/desktop-managers/kde5.nix
View File

@ -73,7 +73,6 @@ in
pkgs.qt4 # qtconfig is the only way to set Qt 4 theme pkgs.qt4 # qtconfig is the only way to set Qt 4 theme
kf5.kinit kf5.kinit
kf5.kglobalaccel
plasma5.breeze plasma5.breeze
plasma5.kde-cli-tools plasma5.kde-cli-tools

5
pkgs/desktops/plasma-5.4/plasma-desktop/default.nix
View File

@ -9,7 +9,7 @@
, libcanberra_kde, libpulseaudio, makeKDEWrapper, utillinux , libcanberra_kde, libpulseaudio, makeKDEWrapper, utillinux
}: }:
plasmaPackage { plasmaPackage rec {
name = "plasma-desktop"; name = "plasma-desktop";
nativeBuildInputs = [ nativeBuildInputs = [
extra-cmake-modules extra-cmake-modules
@ -28,6 +28,9 @@ plasmaPackage {
kglobalaccel ki18n kpeople krunner kwin plasma-framework kglobalaccel ki18n kpeople krunner kwin plasma-framework
plasma-workspace qtdeclarative qtx11extras plasma-workspace qtdeclarative qtx11extras
]; ];
# All propagatedBuildInputs should be present in the profile because
# wrappers cannot be used here.
propagatedUserEnvPkgs = propagatedBuildInputs;
patches = [ patches = [
(substituteAll { (substituteAll {
src = ./0001-hwclock.patch; src = ./0001-hwclock.patch;

5
pkgs/desktops/plasma-5.4/plasma-mediacenter.nix
View File

@ -4,7 +4,7 @@
, taglib , taglib
}: }:
plasmaPackage { plasmaPackage rec {
name = "plasma-mediacenter"; name = "plasma-mediacenter";
nativeBuildInputs = [ nativeBuildInputs = [
extra-cmake-modules extra-cmake-modules
@ -17,4 +17,7 @@ plasmaPackage {
baloo kactivities kdeclarative kfilemetadata ki18n kio baloo kactivities kdeclarative kfilemetadata ki18n kio
plasma-framework plasma-framework
]; ];
# All propagatedBuildInputs should be present in the profile because
# wrappers cannot be used here.
propagatedUserEnvPkgs = propagatedBuildInputs;
} }

5
pkgs/desktops/plasma-5.4/plasma-workspace/default.nix
View File

@ -10,7 +10,7 @@
, xprop, xrdb, xset, xsetroot, solid, qtquickcontrols , xprop, xrdb, xset, xsetroot, solid, qtquickcontrols
}: }:
plasmaPackage { plasmaPackage rec {
name = "plasma-workspace"; name = "plasma-workspace";
nativeBuildInputs = [ nativeBuildInputs = [
extra-cmake-modules extra-cmake-modules
@ -28,6 +28,9 @@ plasmaPackage {
kidletime krunner ktexteditor kwin libkscreen libksysguard kidletime krunner ktexteditor kwin libkscreen libksysguard
plasma-framework qtquick1 qtquickcontrols qtx11extras solid plasma-framework qtquick1 qtquickcontrols qtx11extras solid
]; ];
# All propagatedBuildInputs should be present in the profile because
# impure wrappers are used below.
propagatedUserEnvPkgs = propagatedBuildInputs;
patches = [ ./0001-startkde-NixOS-patches.patch ]; patches = [ ./0001-startkde-NixOS-patches.patch ];
inherit bash coreutils gnused gnugrep socat; inherit bash coreutils gnused gnugrep socat;