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

more merge fallout

Browse Source
This commit is contained in:
Eric Seidel 2015-04-06 20:12:47 -07:00
parent c94b24fa4a
commit 8e9f13e7e9
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/top-level/all-packages.nix
View File

@ -5777,7 +5777,7 @@ let
giblib = callPackage ../development/libraries/giblib { }; giblib = callPackage ../development/libraries/giblib { };
libgit2 = callPackage ../development/libraries/git2 { cmake = cmake-3_2; }; libgit2 = callPackage ../development/libraries/git2 { };
glew = callPackage ../development/libraries/glew { }; glew = callPackage ../development/libraries/glew { };
@ -6261,6 +6261,8 @@ let
libchop = callPackage ../development/libraries/libchop { }; libchop = callPackage ../development/libraries/libchop { };
libclc = callPackage ../development/libraries/libclc { };
libcli = callPackage ../development/libraries/libcli { }; libcli = callPackage ../development/libraries/libcli { };
libcm = callPackage ../development/libraries/libcm { }; libcm = callPackage ../development/libraries/libcm { };
@ -6662,6 +6664,8 @@ let
liboil = callPackage ../development/libraries/liboil { }; liboil = callPackage ../development/libraries/liboil { };
libomxil-bellagio = callPackage ../development/libraries/libomxil-bellagio { };
liboop = callPackage ../development/libraries/liboop { }; liboop = callPackage ../development/libraries/liboop { };
libopus = callPackage ../development/libraries/libopus { }; libopus = callPackage ../development/libraries/libopus { };
@ -7332,7 +7336,7 @@ let
qtLib = qt48Full; qtLib = qt48Full;
}; };
qt5 = callPackage ../development/libraries/qt-5/5.3 { qt53 = callPackage ../development/libraries/qt-5/5.3 {
mesa = mesa_noglu; mesa = mesa_noglu;
cups = if stdenv.isLinux then cups else null; cups = if stdenv.isLinux then cups else null;
# GNOME dependencies are not used unless gtkStyle == true # GNOME dependencies are not used unless gtkStyle == true
@ -7342,7 +7346,9 @@ let
qt54 = callPackage ../development/libraries/qt-5/5.4 {}; qt54 = callPackage ../development/libraries/qt-5/5.4 {};
qt5Full = appendToName "full" (qt5.override { qt5 = qt54;
qt5Full = appendToName "full" (qt53.override {
buildDocs = true; buildDocs = true;
buildExamples = true; buildExamples = true;
buildTests = true; buildTests = true;
@ -10990,9 +10996,6 @@ let
kdeApps_14_12 = recurseIntoAttrs (callPackage ../applications/kde-apps-14.12 { kdeApps_14_12 = recurseIntoAttrs (callPackage ../applications/kde-apps-14.12 {
kf5 = kf57; kf5 = kf57;
qt5 = qt54; qt5 = qt54;
pkgs = pkgs // {
cmake = cmake-3_2;
};
kde4 = kde4.override { inherit (kdeApps_14_12) kdelibs; }; kde4 = kde4.override { inherit (kdeApps_14_12) kdelibs; };
}); });
kdeApps_stable = kdeApps_14_12; kdeApps_stable = kdeApps_14_12;
@ -13144,11 +13147,11 @@ let
kwooty = callPackage ../applications/networking/newsreaders/kwooty { }; kwooty = callPackage ../applications/networking/newsreaders/kwooty { };
}; };
callPackageOrig = newScope (extra // { cmake = cmake-3_2; }); callPackageOrig = newScope extra;
makePackages = extra: makePackages = extra:
let let
callPackage = newScope (extra // { cmake = cmake-3_2; } // self); callPackage = newScope (extra // self);
kde4 = callPackageOrig dir { inherit callPackage callPackageOrig; }; kde4 = callPackageOrig dir { inherit callPackage callPackageOrig; };
self = self =
kde4 kde4