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

Merge pull request #11778 from ttuegel/fix-KDE-packages

Browse Source 
Fix KDE packages
This commit is contained in:
Thomas Tuegel 2015-12-17 05:57:24 -06:00
commit 7e6cfa2bfd
3 changed files with 24 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/development/libraries/polkit-qt-1/old.nix
View File

@ -1,22 +0,0 @@
{ stdenv, fetchurl, cmake, pkgconfig, polkit, automoc4, glib
, qt4 ? null, qt5 ? null, withQt5 ? false }:
assert (withQt5 -> qt5 != null); assert (!withQt5 -> qt4 != null);
stdenv.mkDerivation {
name = "polkit-qt-1-0.112.0";
src = fetchurl {
url = "mirror://kde/stable/apps/KDE4.x/admin/polkit-qt-1-0.112.0.tar.bz2";
sha256 = "1ip78x20hjqvm08kxhp6gb8hf6k5n6sxyx6kk2yvvq53djzh7yv7";
};
nativeBuildInputs = [ cmake automoc4 pkgconfig ];
propagatedBuildInputs = [ polkit glib ] ++ (if withQt5 then [qt5.base] else [qt4]);
meta = {
description = "A Qt wrapper around PolKit";
maintainers = with stdenv.lib.maintainers; [ ttuegel ];
};
}

8
pkgs/tools/misc/calamares/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchgit, cmake, qt5, polkit_qt5, libyamlcpp, python, boost, parted
{ stdenv, fetchgit, cmake, polkitQt, libyamlcpp, python, boost, parted
, extra-cmake-modules, kconfig, ki18n, kcoreaddons, solid, utillinux, libatasmart
, ckbcomp, glibc, tzdata, xkeyboard_config }:
, ckbcomp, glibc, tzdata, xkeyboard_config, qtbase, qtquick1, qtsvg, qttools }:
stdenv.mkDerivation rec {
name = "calamares-${version}";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
cmake qt5.base qt5.tools libyamlcpp python boost polkit_qt5 parted
cmake qtbase qtquick1 qtsvg qttools libyamlcpp python boost polkitQt parted
extra-cmake-modules kconfig ki18n kcoreaddons solid utillinux libatasmart
];
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
'';
preInstall = ''
substituteInPlace cmake_install.cmake --replace "${polkit_qt5}" "$out"
substituteInPlace cmake_install.cmake --replace "${polkitQt}" "$out"
'';
meta = with stdenv.lib; {

47
pkgs/top-level/all-packages.nix
View File

@ -1732,13 +1732,6 @@ let
ghostscript = null;
};
calamares = callPackage ../tools/misc/calamares rec {
python = python3;
boost = pkgs.boost.override { python=python3; };
libyamlcpp = callPackage ../development/libraries/libyaml-cpp { makePIC=true; boost=boost; };
inherit (kf5_stable) extra-cmake-modules kconfig ki18n kcoreaddons solid;
};
grub = callPackage_i686 ../tools/misc/grub {
buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true;
automake = automake112x; # fails with 13 and 14
@ -6860,10 +6853,6 @@ let
automake = automake111x;
};
kf517 = import ../development/libraries/kde-frameworks-5.17 { inherit pkgs; };
kf5_stable = kf517;
kf5_latest = kf517;
kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { };
krb5Full = callPackage ../development/libraries/kerberos/krb5.nix {
@ -8070,8 +8059,6 @@ let
polkit_qt4 = callPackage ../development/libraries/polkit-qt-1 { };
polkit_qt5 = callPackage ../development/libraries/polkit-qt-1/old.nix { withQt5 = true; };
policykit = callPackage ../development/libraries/policykit { };
poppler = callPackage ../development/libraries/poppler { lcms = lcms2; };
@ -12221,10 +12208,6 @@ let
boost = boost155;
};
kdeApps_15_12 = import ../applications/kde-apps-15.12 { inherit pkgs; };
kdeApps_stable = kdeApps_15_12;
kdeApps_latest = kdeApps_15_12;
keepnote = callPackage ../applications/office/keepnote {
pygtk = pyGtkGlade;
};
@ -14724,12 +14707,14 @@ let
numix-gtk-theme = callPackage ../misc/themes/gtk3/numix-gtk-theme { };
plasma55 = import ../desktops/plasma-5.5 { inherit pkgs; };
plasma5_stable = plasma55;
plasma5_latest = plasma55;
kde5PackagesFun = self: with self; {
calamares = callPackage ../tools/misc/calamares rec {
python = python3;
boost = pkgs.boost.override { python=python3; };
libyamlcpp = callPackage ../development/libraries/libyaml-cpp { makePIC=true; boost=boost; };
};
fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { };
k9copy = callPackage ../applications/video/k9copy {};
@ -14769,14 +14754,22 @@ let
};
kde5 =
recurseIntoAttrs
(lib.makeScope qt55Libs.newScope (self:
kf5_stable self // plasma5_stable self // kdeApps_stable self // kde5PackagesFun self));
let
frameworks = import ../development/libraries/kde-frameworks-5.17 { inherit pkgs; };
plasma = import ../desktops/plasma-5.5 { inherit pkgs; };
apps = import ../applications/kde-apps-15.12 { inherit pkgs; };
merged = self: frameworks self // plasma self // apps self // kde5PackagesFun self;
in
recurseIntoAttrs (lib.makeScope qt55Libs.newScope merged);
kde5_latest =
recurseIntoAttrs
(lib.makeScope qt55Libs.newScope (self:
kf5_latest self // plasma5_latest self // kdeApps_latest self // kde5PackagesFun self));
let
frameworks = import ../development/libraries/kde-frameworks-5.17 { inherit pkgs; };
plasma = import ../desktops/plasma-5.5 { inherit pkgs; };
apps = import ../applications/kde-apps-15.12 { inherit pkgs; };
merged = self: frameworks self // plasma self // apps self // kde5PackagesFun self;
in
recurseIntoAttrs (lib.makeScope qt55Libs.newScope merged);
theme-vertex = callPackage ../misc/themes/vertex { };