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

Merge pull request #27931 from gnidorah/kde

Browse Source 
Fix some KDE applications
This commit is contained in:
Frederik Rietdijk 2017-08-07 13:15:36 +02:00 committed by GitHub
commit e6808e30ae
6 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/config/system-path.nix
View File

@ -118,6 +118,9 @@ in
"/share/themes" "/share/themes"
"/share/vim-plugins" "/share/vim-plugins"
"/share/vulkan" "/share/vulkan"
"/share/kservices5"
"/share/kservicetypes5"
"/share/kxmlgui5"
]; ];
system.path = pkgs.buildEnv { system.path = pkgs.buildEnv {

4
pkgs/applications/kde/gwenview.nix
View File

@ -3,7 +3,7 @@
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools,
exiv2, lcms2, exiv2, lcms2,
baloo, kactivities, kdelibs4support, kio, kipi-plugins, libkdcraw, libkipi, baloo, kactivities, kdelibs4support, kio, kipi-plugins, libkdcraw, libkipi,
phonon, qtimageformats, qtsvg, qtx11extras phonon, qtimageformats, qtsvg, qtx11extras, kinit
}: }:
mkDerivation { mkDerivation {
@ -17,5 +17,5 @@ mkDerivation {
baloo exiv2 kactivities kdelibs4support kio libkdcraw lcms2 libkipi phonon baloo exiv2 kactivities kdelibs4support kio libkdcraw lcms2 libkipi phonon
qtimageformats qtsvg qtx11extras qtimageformats qtsvg qtx11extras
]; ];
propagatedUserEnvPkgs = [ kipi-plugins ]; propagatedUserEnvPkgs = [ kipi-plugins libkipi (lib.getBin kinit) ];
} }

3
pkgs/applications/kde/k3b.nix
View File

@ -5,7 +5,7 @@
, flac, lame, libmad, libmpcdec, libvorbis , flac, lame, libmad, libmpcdec, libvorbis
, libsamplerate, libsndfile, taglib , libsamplerate, libsndfile, taglib
, cdparanoia, cdrdao, cdrtools, dvdplusrwtools, libburn, libdvdcss, libdvdread, vcdimager , cdparanoia, cdrdao, cdrtools, dvdplusrwtools, libburn, libdvdcss, libdvdread, vcdimager
, ffmpeg, libmusicbrainz2, normalize, sox, transcode, shared_mime_info , ffmpeg, libmusicbrainz2, normalize, sox, transcode, shared_mime_info, kinit
}: }:
mkDerivation { mkDerivation {
@ -30,6 +30,7 @@ mkDerivation {
# others # others
ffmpeg libmusicbrainz2 shared_mime_info ffmpeg libmusicbrainz2 shared_mime_info
]; ];
propagatedUserEnvPkgs = [ (lib.getBin kinit) ];
postFixup = postFixup =
let k3bPath = lib.makeBinPath [ let k3bPath = lib.makeBinPath [
cdrdao cdrtools dvdplusrwtools libburn normalize sox transcode cdrdao cdrtools dvdplusrwtools libburn normalize sox transcode

1
pkgs/applications/kde/konsole.nix
View File

@ -20,4 +20,5 @@ mkDerivation {
kguiaddons kiconthemes kinit kio knotifications knotifyconfig kparts kpty kguiaddons kiconthemes kinit kio knotifications knotifyconfig kparts kpty
kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript
]; ];
propagatedUserEnvPkgs = [ (lib.getBin kinit) ];
} }

2
pkgs/applications/kde/spectacle.nix
View File

@ -16,5 +16,5 @@ mkDerivation {
kconfig kcoreaddons kdbusaddons kdeclarative kio knotifications kconfig kcoreaddons kdbusaddons kdeclarative kio knotifications
kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras
]; ];
propagatedUserEnvPkgs = [ kipi-plugins ]; propagatedUserEnvPkgs = [ kipi-plugins libkipi ];
} }

15
pkgs/applications/misc/k3b/wrapper.nix
View File

@ -1,15 +0,0 @@
{ lib, symlinkJoin, k3b-original, cdrtools, makeWrapper }:
let
binPath = lib.makeBinPath [ cdrtools ];
in symlinkJoin {
name = "k3b-${k3b-original.version}";
paths = [ k3b-original ];
buildInputs = [ makeWrapper ];
postBuild = ''
wrapProgram $out/bin/k3b \
--prefix PATH ':' ${binPath}
'';
}