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

KDE 4.10: add branch info

This commit is contained in:
Evgeny Egorochkin 2014-02-18 02:58:56 +02:00
parent 53b6744646
commit 5174a69400
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/desktops/kde-4.10/default.nix
View File

@ -1,9 +1,10 @@
{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.10.5" }: { callPackage, callPackageOrig, stdenv, qt48, release ? "4.10.5" }:
let let
branch = "4.10";
# Need callPackageOrig to avoid infinite cycle # Need callPackageOrig to avoid infinite cycle
kde = callPackageOrig ./kde-package { kde = callPackageOrig ./kde-package {
inherit release ignoreList extraSubpkgs callPackage; inherit release branch ignoreList extraSubpkgs callPackage;
}; };
# The list of igored individual modules # The list of igored individual modules
@ -64,7 +65,7 @@ kde.modules // kde.individual //
full = stdenv.lib.attrValues kde.modules; full = stdenv.lib.attrValues kde.modules;
l10n = callPackage ./l10n { l10n = callPackage ./l10n {
inherit release; inherit release branch;
inherit (kde.manifest) stable; inherit (kde.manifest) stable;
}; };
} }

3
pkgs/desktops/kde-4.10/kde-package/default.nix
View File

@ -1,5 +1,5 @@
{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4 { callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4
, release, ignoreList, extraSubpkgs , release, branch, ignoreList, extraSubpkgs
}: }:
let let
@ -19,6 +19,7 @@ rec {
# Default meta attribute # Default meta attribute
defMeta = { defMeta = {
homepage = http://www.kde.org; homepage = http://www.kde.org;
inherit branch;
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
inherit (qt4.meta) maintainers; inherit (qt4.meta) maintainers;
}; };

3
pkgs/desktops/kde-4.10/l10n/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, kdelibs, gettext, release, stable }: { stdenv, fetchurl, kdelibs, gettext, release, branch, stable }:
let let
@ -22,6 +22,7 @@ let
meta = { meta = {
description = "KDE translation for ${lang}"; description = "KDE translation for ${lang}";
inherit branch;
license = "GPL"; license = "GPL";
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
inherit (kdelibs.meta) maintainers homepage; inherit (kdelibs.meta) maintainers homepage;