Commit graph

6 commits

Author SHA1 Message Date
Michael Raskin
1771bf0051 Update fltk
svn path=/nixpkgs/trunk/; revision=20781
2010-03-23 13:00:06 +00:00
Marc Weber
b56ed35851 replacing applyAndFun by lib.defaultOverridableDelayableArgs
applyAndFun has a bug resulting in the same arg beeing added more than
once when using a concatenating merge function for the attr set.

I've tried giving the function a name "overridableDelayableArgs" which
resembles its usage much more.

important refactoring:
  applyAndFun had .fun and .funMerge only when passing the merge
  function lib.mergeOrApply

  composableDerivation {
    initial = {
      ...
    };
  }

to

  overridableDelayableArgs has always .replace and .merge
  composableDerivation {} {
    ...
  }

svn path=/nixpkgs/trunk/; revision=14428
2009-03-06 23:21:28 +00:00
Marc Weber
e996113be7 removed mkDerivationByConfiguration, using composableDerivation instead
qgis, vim_configurable both work now

svn path=/nixpkgs/trunk/; revision=13661
2008-12-20 01:20:35 +00:00
Marc Weber
232d0afe8e fltk version bump 2.0.x-r6483
svn path=/nixpkgs/trunk/; revision=13123
2008-10-26 20:29:47 +00:00
Marc Weber
fb437cf98d exrviewer added (needs ctl openexr openexr_ctl)
fltk update
ilmbase updated
ndiswrapper does compile but has to be integrated into the kernel somehow

svn path=/nixpkgs/trunk/; revision=9863
2007-12-05 21:25:47 +00:00
Marc Weber
3e6eebc6e5 fltk-2.0
svn path=/nixpkgs/trunk/; revision=9171
2007-08-20 10:42:09 +00:00