diff options
author | Marc Weber <marco-oweber@gmx.de> | 2009-05-24 10:57:41 +0000 |
---|---|---|
committer | Marc Weber <marco-oweber@gmx.de> | 2009-05-24 10:57:41 +0000 |
commit | f7f938a1d15277fa11a2cbf75fe9c7d4344f25c3 (patch) | |
tree | 7f0728120b23ae097a4259c62839037bd84aebad /pkgs/applications/graphics | |
parent | 62620f0411b4ada733ae4e701416997140053762 (diff) |
big breaking change: renaming lib.getAttr to lib.attrByPath
getAttr was ambiguous. It's also a builtin function
fix
svn path=/nixpkgs/trunk/; revision=15692
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/hugin/default.nix | 7 | ||||
-rw-r--r-- | pkgs/applications/graphics/xaos/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/graphics/xscreensaver/default.nix | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 9f74f1702fce..c0ce7f15c90b 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -1,4 +1,5 @@ -{stdenv, fetchurl, panotools, cmake, wxGTK, libtiff, libpng, openexr, boost, pkgconfig, exiv2, gettext, ilmbase }: +{stdenv, fetchurl, panotools, cmake, wxGTK, libtiff, libpng, openexr, boost, + pkgconfig, exiv2, gettext, ilmbase, enblendenfuse, autopanosiftc }: stdenv.mkDerivation { name = "hugin-0.7.0"; @@ -35,6 +36,10 @@ stdenv.mkDerivation { eval -- "cmake .. $cmakeFlags" set +x ''; + postInstall = '' + ensureDir $out/nix-support + echo ${enblendenfuse} ${autopanosiftc} > $out/nix-support/$out/nix-support/propagated-user-env-packages + ''; meta = { homepage = http://hugin.sourceforge.net/; diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/applications/graphics/xaos/default.nix index 226dcb8d918e..adf64cdb0d37 100644 --- a/pkgs/applications/graphics/xaos/default.nix +++ b/pkgs/applications/graphics/xaos/default.nix @@ -2,7 +2,7 @@ a : let fetchurl = a.fetchurl; - version = a.lib.getAttr ["version"] "3.4" a; + version = a.lib.attrByPath ["version"] "3.4" a; buildInputs = with a; [ aalib gsl libpng libX11 xproto libXext xextproto libXt zlib gettext intltool perl diff --git a/pkgs/applications/graphics/xscreensaver/default.nix b/pkgs/applications/graphics/xscreensaver/default.nix index fb09838d260b..3c335994a76b 100644 --- a/pkgs/applications/graphics/xscreensaver/default.nix +++ b/pkgs/applications/graphics/xscreensaver/default.nix @@ -1,5 +1,5 @@ args : with args; let localDefs = builderDefs.passthru.function (args // rec { - version = lib.getAttr ["version"] "5.07" args; + version = lib.attrByPath ["version"] "5.07" args; src = /* put a fetchurl here */ fetchurl { url = "http://www.jwz.org/xscreensaver/xscreensaver-${version}.tar.gz"; |