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

kdeApps_15_08: don't override mkDerivation

Browse Source 
Provide a globally unique name (kdeApp) instead of using attribute paths
as namespaces and locally overloading the mkDerivation name.
This commit is contained in:
Thomas Tuegel 2015-09-29 16:54:51 -05:00
parent 92e98c2b03
commit cf5ed04f49
19 changed files with 39 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/kde-apps-15.08/ark.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation { kdeApp
, lib , lib
, extra-cmake-modules , extra-cmake-modules
, kdoctools , kdoctools
@ -16,7 +16,7 @@
, libarchive , libarchive
}: }:
mkDerivation { kdeApp {
name = "ark"; name = "ark";
nativeBuildInputs = [ nativeBuildInputs = [
extra-cmake-modules extra-cmake-modules

4
pkgs/applications/kde-apps-15.08/baloo-widgets.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation { kdeApp
, lib , lib
, extra-cmake-modules , extra-cmake-modules
, kdoctools , kdoctools
@ -11,7 +11,7 @@
, kdelibs4support , kdelibs4support
}: }:
mkDerivation { kdeApp {
name = "baloo-widgets"; name = "baloo-widgets";
nativeBuildInputs = [ nativeBuildInputs = [
extra-cmake-modules extra-cmake-modules

7
pkgs/applications/kde-apps-15.08/default.nix
View File

@ -21,13 +21,12 @@ let
srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; }; srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
mirror = "mirror://kde"; mirror = "mirror://kde";
mkDerivation = args: kdeApp = args:
let let
inherit (stdenv) mkDerivation;
inherit (args) name; inherit (args) name;
sname = args.sname or name; sname = args.sname or name;
inherit (srcs."${sname}") src version; inherit (srcs."${sname}") src version;
in mkDerivation (args // { in stdenv.mkDerivation (args // {
name = "${name}-${version}"; name = "${name}-${version}";
inherit src; inherit src;
@ -64,6 +63,6 @@ let
print-manager = callPackage ./print-manager.nix {}; print-manager = callPackage ./print-manager.nix {};
}; };
newScope = scope: pkgs.kf513.newScope ({ inherit mkDerivation; } // scope); newScope = scope: pkgs.kf513.newScope ({ inherit kdeApp; } // scope);
in lib.makeScope newScope packages in lib.makeScope newScope packages

4
pkgs/applications/kde-apps-15.08/dolphin-plugins.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation { kdeApp
, lib , lib
, extra-cmake-modules , extra-cmake-modules
, kdoctools , kdoctools
@ -9,7 +9,7 @@
, dolphin , dolphin
}: }:
mkDerivation { kdeApp {
name = "dolphin-plugins"; name = "dolphin-plugins";
nativeBuildInputs = [ nativeBuildInputs = [
extra-cmake-modules extra-cmake-modules

4
pkgs/applications/kde-apps-15.08/dolphin.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation { kdeApp
, lib , lib
, extra-cmake-modules , extra-cmake-modules
, kdoctools , kdoctools
@ -26,7 +26,7 @@
, kdelibs4support , kdelibs4support
}: }:
mkDerivation { kdeApp {
name = "dolphin"; name = "dolphin";
nativeBuildInputs = [ nativeBuildInputs = [
extra-cmake-modules extra-cmake-modules

4
pkgs/applications/kde-apps-15.08/ffmpegthumbs.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation { kdeApp
, lib , lib
, automoc4 , automoc4
, cmake , cmake
@ -8,7 +8,7 @@
, ffmpeg , ffmpeg
}: }:
mkDerivation { kdeApp {
name = "ffmpegthumbs"; name = "ffmpegthumbs";
nativeBuildInputs = [ nativeBuildInputs = [
automoc4 automoc4

4
pkgs/applications/kde-apps-15.08/gpgmepp.nix
View File

@ -1,11 +1,11 @@
{ mkDerivation { kdeApp
, lib , lib
, extra-cmake-modules , extra-cmake-modules
, boost , boost
, gpgme , gpgme
}: }:
mkDerivation { kdeApp {
name = "gpgmepp"; name = "gpgmepp";
nativeBuildInputs = [ nativeBuildInputs = [
extra-cmake-modules extra-cmake-modules

4
pkgs/applications/kde-apps-15.08/gwenview.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation { kdeApp
, lib , lib
, extra-cmake-modules , extra-cmake-modules
, kdoctools , kdoctools
@ -13,7 +13,7 @@
, qtx11extras , qtx11extras
}: }:
mkDerivation { kdeApp {
name = "gwenview"; name = "gwenview";
nativeBuildInputs = [ nativeBuildInputs = [
extra-cmake-modules extra-cmake-modules

4
pkgs/applications/kde-apps-15.08/kate.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation { kdeApp
, lib , lib
, extra-cmake-modules , extra-cmake-modules
, kdoctools , kdoctools
@ -26,7 +26,7 @@
, libgit2 , libgit2
}: }:
mkDerivation { kdeApp {
name = "kate"; name = "kate";
nativeBuildInputs = [ nativeBuildInputs = [
extra-cmake-modules extra-cmake-modules

4
pkgs/applications/kde-apps-15.08/kdegraphics-thumbnailers.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation { kdeApp
, lib , lib
, automoc4 , automoc4
, cmake , cmake
@ -9,7 +9,7 @@
, libkdcraw , libkdcraw
}: }:
mkDerivation { kdeApp {
name = "kdegraphics-thumbnailers"; name = "kdegraphics-thumbnailers";
nativeBuildInputs = [ nativeBuildInputs = [
automoc4 automoc4

4
pkgs/applications/kde-apps-15.08/kdelibs/default.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation, attica, attr, automoc4, avahi, bison, cmake { kdeApp, attica, attr, automoc4, avahi, bison, cmake
, docbook_xml_dtd_42, docbook_xsl, flex, giflib, herqq, ilmbase , docbook_xml_dtd_42, docbook_xsl, flex, giflib, herqq, ilmbase
, libdbusmenu_qt, libjpeg, libxml2, libxslt, perl, phonon, pkgconfig , libdbusmenu_qt, libjpeg, libxml2, libxslt, perl, phonon, pkgconfig
, polkit_qt4, qca2, qt4, shared_desktop_ontologies, shared_mime_info , polkit_qt4, qca2, qt4, shared_desktop_ontologies, shared_mime_info
@ -6,7 +6,7 @@
, lib , lib
}: }:
mkDerivation { kdeApp {
name = "kdelibs"; name = "kdelibs";
buildInputs = [ buildInputs = [

4
pkgs/applications/kde-apps-15.08/kgpg.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation { kdeApp
, lib , lib
, automoc4 , automoc4
, cmake , cmake
@ -10,7 +10,7 @@
, kdepimlibs , kdepimlibs
}: }:
mkDerivation { kdeApp {
name = "kgpg"; name = "kgpg";
nativeBuildInputs = [ nativeBuildInputs = [
automoc4 automoc4

4
pkgs/applications/kde-apps-15.08/konsole.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation { kdeApp
, lib , lib
, extra-cmake-modules , extra-cmake-modules
, kdoctools , kdoctools
@ -25,7 +25,7 @@
, kxmlgui , kxmlgui
}: }:
mkDerivation { kdeApp {
name = "konsole"; name = "konsole";
nativeBuildInputs = [ nativeBuildInputs = [
extra-cmake-modules extra-cmake-modules

4
pkgs/applications/kde-apps-15.08/ksnapshot.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation { kdeApp
, lib , lib
, automoc4 , automoc4
, cmake , cmake
@ -9,7 +9,7 @@
, libXfixes , libXfixes
}: }:
mkDerivation { kdeApp {
name = "ksnapshot"; name = "ksnapshot";
nativeBuildInputs = [ nativeBuildInputs = [
automoc4 automoc4

4
pkgs/applications/kde-apps-15.08/libkdcraw.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation { kdeApp
, lib , lib
, automoc4 , automoc4
, cmake , cmake
@ -8,7 +8,7 @@
, kdelibs , kdelibs
}: }:
mkDerivation { kdeApp {
name = "libkdcraw"; name = "libkdcraw";
nativeBuildInputs = [ nativeBuildInputs = [
automoc4 automoc4

4
pkgs/applications/kde-apps-15.08/libkexiv2.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation { kdeApp
, lib , lib
, automoc4 , automoc4
, cmake , cmake
@ -8,7 +8,7 @@
, kdelibs , kdelibs
}: }:
mkDerivation { kdeApp {
name = "libkexiv2"; name = "libkexiv2";
nativeBuildInputs = [ nativeBuildInputs = [
automoc4 automoc4

4
pkgs/applications/kde-apps-15.08/libkipi.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation { kdeApp
, lib , lib
, automoc4 , automoc4
, cmake , cmake
@ -7,7 +7,7 @@
, kdelibs , kdelibs
}: }:
mkDerivation { kdeApp {
name = "libkipi"; name = "libkipi";
nativeBuildInputs = [ nativeBuildInputs = [
automoc4 automoc4

4
pkgs/applications/kde-apps-15.08/okular.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation { kdeApp
, lib , lib
, automoc4 , automoc4
, cmake , cmake
@ -15,7 +15,7 @@
, ebook_tools , ebook_tools
}: }:
mkDerivation { kdeApp {
name = "okular"; name = "okular";
nativeBuildInputs = [ nativeBuildInputs = [
automoc4 automoc4

4
pkgs/applications/kde-apps-15.08/print-manager.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation { kdeApp
, lib , lib
, extra-cmake-modules , extra-cmake-modules
, qtdeclarative , qtdeclarative
@ -17,7 +17,7 @@
, kitemviews , kitemviews
}: }:
mkDerivation { kdeApp {
name = "print-manager"; name = "print-manager";
nativeBuildInputs = [ nativeBuildInputs = [
extra-cmake-modules extra-cmake-modules