diff options
| author | Evgeny Egorochkin <phreedom@yandex.ru> | 2014-02-18 03:10:25 +0200 |
|---|---|---|
| committer | Evgeny Egorochkin <phreedom@yandex.ru> | 2014-02-18 03:10:25 +0200 |
| commit | 586188fa7d0bd4851a8c3ef30603a0efeaaa9430 (patch) | |
| tree | 34c8eaf7c566990bf1903bfc52f8c2f0d82f19f8 /pkgs | |
| parent | 5174a694006ef1bf338e53163273088da3e12a41 (diff) | |
| download | nixpkgs-586188fa7d0bd4851a8c3ef30603a0efeaaa9430.tar nixpkgs-586188fa7d0bd4851a8c3ef30603a0efeaaa9430.tar.gz nixpkgs-586188fa7d0bd4851a8c3ef30603a0efeaaa9430.tar.bz2 nixpkgs-586188fa7d0bd4851a8c3ef30603a0efeaaa9430.tar.lz nixpkgs-586188fa7d0bd4851a8c3ef30603a0efeaaa9430.tar.xz nixpkgs-586188fa7d0bd4851a8c3ef30603a0efeaaa9430.tar.zst nixpkgs-586188fa7d0bd4851a8c3ef30603a0efeaaa9430.zip | |
KDE 4.11: add branch meta
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/desktops/kde-4.11/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/desktops/kde-4.11/kde-package/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/desktops/kde-4.11/l10n/default.nix | 3 |
3 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/desktops/kde-4.11/default.nix b/pkgs/desktops/kde-4.11/default.nix index 95bf4b512c7..269bdc0d3a7 100644 --- a/pkgs/desktops/kde-4.11/default.nix +++ b/pkgs/desktops/kde-4.11/default.nix @@ -1,9 +1,11 @@ { callPackage, callPackageOrig, stdenv, qt48, release ? "4.11.5" }: let + branch = "4.11"; + # 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 @@ -36,7 +38,7 @@ kde.modules // kde.individual // full = stdenv.lib.attrValues kde.modules; l10n = callPackage ./l10n { - inherit release; + inherit release branch; inherit (kde.manifest) stable; }; } diff --git a/pkgs/desktops/kde-4.11/kde-package/default.nix b/pkgs/desktops/kde-4.11/kde-package/default.nix index 8a6e8e16751..9424a762c8f 100644 --- a/pkgs/desktops/kde-4.11/kde-package/default.nix +++ b/pkgs/desktops/kde-4.11/kde-package/default.nix @@ -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; }; diff --git a/pkgs/desktops/kde-4.11/l10n/default.nix b/pkgs/desktops/kde-4.11/l10n/default.nix index c9fab80bffb..fa6406043b1 100644 --- a/pkgs/desktops/kde-4.11/l10n/default.nix +++ b/pkgs/desktops/kde-4.11/l10n/default.nix @@ -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; |