diff options
author | Evgeny Egorochkin <phreedom@yandex.ru> | 2014-02-18 03:18:02 +0200 |
---|---|---|
committer | Evgeny Egorochkin <phreedom@yandex.ru> | 2014-02-18 03:18:02 +0200 |
commit | 952fa02b9075f8d2bb7783e1cda3df491261fc6c (patch) | |
tree | 0838ce686469a2268681d9c2b7bf3fec416d489b | |
parent | 586188fa7d0bd4851a8c3ef30603a0efeaaa9430 (diff) | |
download | nixlib-952fa02b9075f8d2bb7783e1cda3df491261fc6c.tar nixlib-952fa02b9075f8d2bb7783e1cda3df491261fc6c.tar.gz nixlib-952fa02b9075f8d2bb7783e1cda3df491261fc6c.tar.bz2 nixlib-952fa02b9075f8d2bb7783e1cda3df491261fc6c.tar.lz nixlib-952fa02b9075f8d2bb7783e1cda3df491261fc6c.tar.xz nixlib-952fa02b9075f8d2bb7783e1cda3df491261fc6c.tar.zst nixlib-952fa02b9075f8d2bb7783e1cda3df491261fc6c.zip |
KDE 4.12: add branch meta
-rw-r--r-- | pkgs/desktops/kde-4.12/default.nix | 6 | ||||
-rw-r--r-- | pkgs/desktops/kde-4.12/kde-package/default.nix | 3 | ||||
-rw-r--r-- | pkgs/desktops/kde-4.12/l10n/default.nix | 3 |
3 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/desktops/kde-4.12/default.nix b/pkgs/desktops/kde-4.12/default.nix index b8e0a828a888..6d3dd46df354 100644 --- a/pkgs/desktops/kde-4.12/default.nix +++ b/pkgs/desktops/kde-4.12/default.nix @@ -1,9 +1,11 @@ { callPackage, callPackageOrig, stdenv, qt48, release ? "4.12.2" }: let + branch = "4.12"; + # 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.12/kde-package/default.nix b/pkgs/desktops/kde-4.12/kde-package/default.nix index 04f798c233a1..6b4e1ba0ad87 100644 --- a/pkgs/desktops/kde-4.12/kde-package/default.nix +++ b/pkgs/desktops/kde-4.12/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.12/l10n/default.nix b/pkgs/desktops/kde-4.12/l10n/default.nix index c9fab80bffb4..fa6406043b1b 100644 --- a/pkgs/desktops/kde-4.12/l10n/default.nix +++ b/pkgs/desktops/kde-4.12/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; |