3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

76790 commits

Author SHA1 Message Date
Vladimír Čunát d3a3aa8674 Merge #12740: multiple outputs for Qt 5 and KDE 5 2016-02-03 17:09:09 +01:00
Vladimír Čunát 2c51a075ab makeFontsConf: fix with multiple outputs 2016-02-03 16:57:41 +01:00
Vladimír Čunát bd2ca1e539 libvdpau: fixup branch interactions
This solution is cleaner anyway.
2016-02-03 16:57:41 +01:00
Vladimír Čunát f89a136fd5 cc-wrapper: fixup branch interactions
c0599fdd61 and changes on closure-size didn't go well together.
2016-02-03 16:57:41 +01:00
Vladimír Čunát ae74c356d9 Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Nikolay Amiantov 53e0f8b1cd Merge branch 'fontconfig-caches' into staging
Closes #12668, fixes #12648
2016-02-01 12:20:06 +03:00
Nikolay Amiantov b64ca73b81 Merge remote-tracking branch 'nckx/update-freetype' into staging
Closes #12600
2016-02-01 12:18:02 +03:00
Thomas Tuegel f43eb5ece0 qt54.qttools: move runtime executables to $out 2016-01-31 21:15:03 -06:00
Thomas Tuegel 4768f41e36 nixos/kde5: use runtime outputs 2016-01-31 21:15:03 -06:00
Thomas Tuegel db419ce555 sddm: remove bash-ism 2016-01-31 21:15:03 -06:00
Thomas Tuegel 29e2b511db sddm: link theme runtime outputs 2016-01-31 21:15:03 -06:00
Thomas Tuegel 6c327da007 kde5.kservice: remove redundant propagatedUserEnvPkgs 2016-01-31 21:15:03 -06:00
Thomas Tuegel 98aa081812 kde5.breeze-icons: remove redundant propagatedUserEnvPkgs 2016-01-31 21:15:03 -06:00
Thomas Tuegel a7ae370fa3 kde5.plasma-workspace: propagate inputs automatically 2016-01-31 21:15:03 -06:00
Thomas Tuegel 30d6a71995 kde5.plasma-workspace: remove redundant propagatedUserEnvPkgs 2016-01-31 21:15:03 -06:00
Thomas Tuegel 7b11d5066a kde5.plasma-desktop: remove redundant propagatedUserEnvPkgs 2016-01-31 21:15:03 -06:00
Thomas Tuegel a5b7cf0939 kde5.kscreen: remove redundant propagatedUserEnvPkgs 2016-01-31 21:15:03 -06:00
Thomas Tuegel 7ea3225ea4 kde5.breeze: use runtime outputs 2016-01-31 21:15:03 -06:00
Thomas Tuegel 588c8499f7 qt55: don't set output flags by default 2016-01-31 21:15:03 -06:00
Thomas Tuegel 2efbf665a3 qt55.qttools: move runtime executables to $out 2016-01-31 21:15:03 -06:00
Thomas Tuegel fe1bae4e58 spotify: udev -> libudev 2016-01-31 21:15:03 -06:00
Thomas Tuegel 2f4087b13d google-talk-plugin: udev -> libudev 2016-01-31 21:15:03 -06:00
Thomas Tuegel 0c79c7c3b2 qt54.qtconnectivity: fix Qt module CMake config files 2016-01-31 21:15:03 -06:00
Thomas Tuegel 6e623f8784 qt54.qtenginio: fix Qt module CMake config files 2016-01-31 21:15:03 -06:00
Thomas Tuegel b3c8878a65 qt54.qtlocation: fix Qt module CMake config files 2016-01-31 21:15:03 -06:00
Thomas Tuegel a7cce8b329 qt54.qtmultimedia: fix Qt module CMake config files 2016-01-31 21:15:03 -06:00
Thomas Tuegel d769d6c3bd qt54.qtquick1: fix Qt module CMake config files 2016-01-31 21:15:03 -06:00
Thomas Tuegel 2f0ec07921 qt54.qtsensors: fix Qt module CMake config files 2016-01-31 21:15:03 -06:00
Thomas Tuegel 3bb5501a88 qt54.qtserialport: fix Qt module CMake config files 2016-01-31 21:15:03 -06:00
Thomas Tuegel ece0396b55 qt54.qtsvg: fix Qt module CMake config files 2016-01-31 21:15:03 -06:00
Thomas Tuegel 35f33b438c qt54.qttools: fix Qt module CMake config files 2016-01-31 21:15:03 -06:00
Thomas Tuegel 1a481e58ec qt54.qtwebkit: fix Qt module CMake config files 2016-01-31 21:15:03 -06:00
Thomas Tuegel 4d25e97193 qt54.qtwebsockets: fix Qt module CMake config files 2016-01-31 21:15:03 -06:00
Thomas Tuegel 669dcb3485 qt54.qtx11extras: fix Qt module CMake config files 2016-01-31 21:15:03 -06:00
Thomas Tuegel a67c2ded6b qt54.qtxmlpatterns: fix Qt module CMake config files 2016-01-31 21:15:03 -06:00
Thomas Tuegel b7db2185a0 qt54.qtdeclarative: fix Qt module CMake config files 2016-01-31 21:15:03 -06:00
Thomas Tuegel fbcdf3ee62 qt54.qtscript: fix Qt module CMake config files 2016-01-31 21:15:03 -06:00
Thomas Tuegel 65ef8578c2 qt54.qtbase: fix Qt module CMake config files 2016-01-31 21:15:03 -06:00
Thomas Tuegel f4e6b173bb qt54: add fixQtModuleCMakeConfig setup hook 2016-01-31 21:15:03 -06:00
Thomas Tuegel d282d0bfe7 qt54.qtbase: set licenses correctly 2016-01-31 21:15:03 -06:00
Thomas Tuegel 150238dc99 qt54: updated homepage 2016-01-31 21:15:03 -06:00
Thomas Tuegel 7840e5e9a1 kde5.kde-gtk-config: fix extra include paths 2016-01-31 21:15:03 -06:00
Thomas Tuegel 9065ab0c8a kde5.extra-cmake-modules: rewrite setupHook
The rewrite achieves three goals. First, all the installation paths are
set correctly for multiple outputs. Second, the correct search paths are
set for all types of shared data. Third, packages are installed through
propagatedUserEnvPkgs as required.
2016-01-31 21:15:03 -06:00
Thomas Tuegel f6e87370fb kde5.kauth: fix helper install paths 2016-01-31 21:15:03 -06:00
Thomas Tuegel bda1938d3a kde5.plasma: use multiple outputs 2016-01-31 21:15:03 -06:00
Thomas Tuegel ec9073dd2e kde5.plasma: remove misguided setupHook 2016-01-31 21:15:03 -06:00
Thomas Tuegel 4f7297f1e3 kde5.apps: use multiple outputs 2016-01-31 21:15:03 -06:00
Thomas Tuegel 7049bde4d5 kde5.kdelibs4support: use multiple outputs 2016-01-31 21:15:03 -06:00
Thomas Tuegel cfd70eac9d kde5.kservice: propagate service and service type inputs 2016-01-31 21:15:03 -06:00
Thomas Tuegel 02c3ae154d kde5.kservice: propagate extra-cmake-modules input 2016-01-31 21:15:03 -06:00