Author: eelco
Date: Thu Jul 7 19:56:01 2011
New Revision: 27640
URL: https://svn.nixos.org/websvn/nix/?rev=27640&sc=1
Log:
* Doh, cmake doesn't extrapolate $(out).
Modified:
nixpkgs/branches/kde-4.7/pkgs/development/libraries/qt-4.x/4.7/default.nix
Modified:
nixpkgs/branches/kde-4.7/pkgs/development/libraries/qt-4.x/4.7/default.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/development/libraries/qt-4.x/4.7/default.nix
Thu Jul 7 19:18:40 2011 (r27639)
+++ nixpkgs/branches/kde-4.7/pkgs/development/libraries/qt-4.x/4.7/default.nix
Thu Jul 7 19:56:01 2011 (r27640)
@@ -23,6 +23,15 @@
preConfigure =
''
export LD_LIBRARY_PATH="`pwd`/lib:$LD_LIBRARY_PATH"
+ configureFlags+="
+ -docdir $out/share/doc/${name}
+ -plugindir $out/lib/qt4/plugins
+ -importdir $out/lib/qt4/imports
+ -examplesdir $out/share/doc/${name}/examples
+ -demosdir $out/share/doc/${name}/demos
+ -datadir $out/share/${name}
+ -translationdir $out/share/${name}/translations
+ "
'';
configureFlags =
@@ -40,13 +49,6 @@
${if buildDemos == true then "-make demos" else "-nomake demos"}
${if buildExamples == true then "-make examples" else "-nomake examples"}
${if useDocs then "-make docs" else "-nomake docs"}
- -docdir $out/share/doc/${name}
- -plugindir $out/lib/qt4/plugins
- -importdir $out/lib/qt4/imports
- -examplesdir $out/share/doc/${name}/examples
- -demosdir $out/share/doc/${name}/demos
- -datadir $out/share/${name}
- -translationdir $out/share/${name}/translations
'';
propagatedBuildInputs = [
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
