mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 07:13:23 +01:00
KDE 4.10: add branch info
This commit is contained in:
parent
53b6744646
commit
5174a69400
3 changed files with 7 additions and 4 deletions
|
@ -1,9 +1,10 @@
|
|||
{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.10.5" }:
|
||||
|
||||
let
|
||||
branch = "4.10";
|
||||
# Need callPackageOrig to avoid infinite cycle
|
||||
kde = callPackageOrig ./kde-package {
|
||||
inherit release ignoreList extraSubpkgs callPackage;
|
||||
inherit release branch ignoreList extraSubpkgs callPackage;
|
||||
};
|
||||
|
||||
# The list of igored individual modules
|
||||
|
@ -64,7 +65,7 @@ kde.modules // kde.individual //
|
|||
full = stdenv.lib.attrValues kde.modules;
|
||||
|
||||
l10n = callPackage ./l10n {
|
||||
inherit release;
|
||||
inherit release branch;
|
||||
inherit (kde.manifest) stable;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4
|
||||
, release, ignoreList, extraSubpkgs
|
||||
, release, branch, ignoreList, extraSubpkgs
|
||||
}:
|
||||
|
||||
let
|
||||
|
@ -19,6 +19,7 @@ rec {
|
|||
# Default meta attribute
|
||||
defMeta = {
|
||||
homepage = http://www.kde.org;
|
||||
inherit branch;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
inherit (qt4.meta) maintainers;
|
||||
};
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, kdelibs, gettext, release, stable }:
|
||||
{ stdenv, fetchurl, kdelibs, gettext, release, branch, stable }:
|
||||
|
||||
let
|
||||
|
||||
|
@ -22,6 +22,7 @@ let
|
|||
|
||||
meta = {
|
||||
description = "KDE translation for ${lang}";
|
||||
inherit branch;
|
||||
license = "GPL";
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
inherit (kdelibs.meta) maintainers homepage;
|
||||
|
|
Loading…
Reference in a new issue