Branch: refs/heads/master
Home: https://github.com/NixOS/nixpkgs
Commit: d423a36aa53c3ba261b0e1c9583706b8598cd774
https://github.com/NixOS/nixpkgs/commit/d423a36aa53c3ba261b0e1c9583706b8598cd774
Author: Thomas Tuegel <ttue...@gmail.com>
Date: 2016-06-01 (Wed, 01 Jun 2016)
Changed paths:
M pkgs/development/libraries/qt-5/5.6/qtbase/setup-hook.sh
Log Message:
-----------
Revert "qt56.qtbase: apply CMake setup-hook fix locally"
This reverts commit 6b6f067397db8b9a3a051ad6616206871acf098c.
Commit: ddaebefb1215d93c081d13edb50b261c22ba880c
https://github.com/NixOS/nixpkgs/commit/ddaebefb1215d93c081d13edb50b261c22ba880c
Author: Thomas Tuegel <ttue...@gmail.com>
Date: 2016-06-01 (Wed, 01 Jun 2016)
Changed paths:
M pkgs/desktops/kde-5/frameworks-5.22/extra-cmake-modules/setup-hook.sh
Log Message:
-----------
Revert "extra-cmake-modules: don't change the RPATH settings"
This reverts commit 94fcfc9c419251046efebd477f5f6efa123ae581.
Commit: b2df0a10d97ef0a3ea2f1e2858df971d41f683cb
https://github.com/NixOS/nixpkgs/commit/b2df0a10d97ef0a3ea2f1e2858df971d41f683cb
Author: Thomas Tuegel <ttue...@gmail.com>
Date: 2016-06-01 (Wed, 01 Jun 2016)
Changed paths:
A pkgs/development/libraries/qt-5/5.6/qtbase/cmake-paths.patch
M pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
M pkgs/development/libraries/qt-5/5.6/qtbase/series
M pkgs/development/libraries/qt-5/5.6/qtbase/setup-hook.sh
Log Message:
-----------
qt56.qtbase: patch CMake module paths
Commit: b108614ef3ae6b0cf971133c906007492ea9f87d
https://github.com/NixOS/nixpkgs/commit/b108614ef3ae6b0cf971133c906007492ea9f87d
Author: Thomas Tuegel <ttue...@gmail.com>
Date: 2016-06-01 (Wed, 01 Jun 2016)
Changed paths:
M pkgs/desktops/kde-5/frameworks-5.22/extra-cmake-modules/setup-hook.sh
A pkgs/development/libraries/qt-5/5.6/qtbase/cmake-paths.patch
M pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
M pkgs/development/libraries/qt-5/5.6/qtbase/series
M pkgs/development/libraries/qt-5/5.6/qtbase/setup-hook.sh
Log Message:
-----------
Merge branch 'qt-cmake-paths'
Compare: https://github.com/NixOS/nixpkgs/compare/5f8d14546b6a...b108614ef3ae_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
