diff options
Diffstat (limited to 'pkgs/applications')
14 files changed, 36 insertions, 33 deletions
diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index 5cab85b993c..8d937afeec7 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -4,7 +4,7 @@ let fetchurl = args.fetchurl; fullDepEntry = args.fullDepEntry; - version = lib.getAttr ["version"] "9.4" args; + version = lib.attrByPath ["version"] "9.4" args; buildInputs = with args; [gtk glib pkgconfig libXpm gmp gettext libX11 fftw] ++ (lib.optional (args ? ruby) args.ruby) diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 1cbfff91986..97b582075c4 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -9,25 +9,29 @@ # Why use a local copy? This way it's easier to use the update manager to get plugins :-) -{fetchurl, stdenv, jdk, gtk, glib, libXtst, plugins ? []}: +{fetchurl, stdenv, jdk, gtk, glib, libXtst, makeOverridable, plugins ? [], unzip}: -let { - body = +let eclipseFun = + makeOverridable ({name, bindist} : stdenv.mkDerivation { - name = "eclipse-sdk-3.5M6"; + inherit name; builder = ./builder.sh; src = bindist; - buildInputs = []; + buildInputs = [ unzip /* unzip required by eclipseCDT */ ]; inherit jdk plugins; libraries = [gtk glib libXtst]; - }; + }); in - bindist = - if (stdenv.system == "x86_64-linux") then fetchurl { - url = ftp://sunsite.informatik.rwth-aachen.de/pub/mirror/eclipse/S-3.5M6-200903130100/eclipse-SDK-3.5M6-linux-gtk-x86_64.tar.gz; - sha256 = "10p4idp5rcdf7xqwfk3kvmjxhi8x1v835m0y4pn9q4nhfb5643pi"; - } else fetchurl { - url = ftp://mirror.micromata.de/eclipse/eclipse/downloads/drops/S-3.5M6-200903130100/eclipse-SDK-3.5M6-linux-gtk.tar.gz; - sha256 = "1z8j26b632ydhqrmwgbcqgiq7f1a542jam06z2h62mcbqazrcyah"; - }; -} + eclipseFun { + # you can override these settings usnig .override {...} + name = "eclipse-sdk-3.5M6"; + + bindist = + if (stdenv.system == "x86_64-linux") then fetchurl { + url = ftp://sunsite.informatik.rwth-aachen.de/pub/mirror/eclipse/S-3.5M6-200903130100/eclipse-SDK-3.5M6-linux-gtk-x86_64.tar.gz; + sha256 = "10p4idp5rcdf7xqwfk3kvmjxhi8x1v835m0y4pn9q4nhfb5643pi"; + } else fetchurl { + url = ftp://mirror.micromata.de/eclipse/eclipse/downloads/drops/S-3.5M6-200903130100/eclipse-SDK-3.5M6-linux-gtk.tar.gz; + sha256 = "1z8j26b632ydhqrmwgbcqgiq7f1a542jam06z2h62mcbqazrcyah"; + }; + } diff --git a/pkgs/applications/editors/eclipse/plugins/spoofax/default.nix b/pkgs/applications/editors/eclipse/plugins/spoofax/default.nix deleted file mode 100644 index 649619e487e..00000000000 --- a/pkgs/applications/editors/eclipse/plugins/spoofax/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{stdenv, fetchurl}: - -fetchurl { - url = http://www.ii.uib.no/~karltk/spoofax/plugins/org.spoofax.editor_0.3.11.jar; - md5 = "c36941afcb0e538e16fafd594eae128e"; -} diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 9f74f1702fc..c0ce7f15c90 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 226dcb8d918..adf64cdb0d3 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 fb09838d260..3c335994a76 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"; diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index fd2b90805f5..24ba853f058 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -5,7 +5,7 @@ let doPatchShebangs = args.doPatchShebangs; makeManyWrappers = args.makeManyWrappers; - version = lib.getAttr ["version"] "0.0.21" args; + version = lib.attrByPath ["version"] "0.0.21" args; buildInputs = with args; [ intltool python imagemagick gtk glib webkit libxml2 gtksourceview pkgconfig which gettext makeWrapper diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix index ee8ff18bd5d..890021b33d6 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix @@ -2,7 +2,7 @@ a : let fetchurl = a.fetchurl; - version = a.lib.getAttr ["version"] "1.12.0" a; + version = a.lib.attrByPath ["version"] "1.12.0" a; buildInputs = with a; [ firefox libX11 xproto ]; diff --git a/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix b/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix index b6d8c7feecb..7728f7abcfc 100644 --- a/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix +++ b/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix @@ -5,7 +5,7 @@ args : with args; (to use a fresher pidgin build) */ let - externalPurple2 = (lib.getAttr ["purple2Source"] null args) != null; + externalPurple2 = lib.attrByPath ["purple2Source"] null args) != null; in rec { src = fetchurl { diff --git a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix b/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix index 848045d4a24..257d3d09f71 100644 --- a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix +++ b/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix @@ -5,7 +5,7 @@ args : with args; (to use a fresher pidgin build) */ let - externalPurple2 = (lib.getAttr ["purple2Source"] null args) != null; + externalPurple2 = (lib.attrByPath ["purple2Source"] null args) != null; in rec { src = fetchurl { diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index b8263ff0b15..f5b1d344574 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -2,7 +2,7 @@ a : let fetchurl = a.fetchurl; - version = a.lib.getAttr ["version"] "0.12.1" a; + version = a.lib.attrByPath ["version"] "0.12.1" a; buildInputs = with a; [ python pyGtkGlade gtk perl intltool dbus gettext pkgconfig makeWrapper libglade pyopenssl libXScrnSaver diff --git a/pkgs/applications/science/geometry/drgeo/default.nix b/pkgs/applications/science/geometry/drgeo/default.nix index 8f0bcd08654..ff52d366765 100644 --- a/pkgs/applications/science/geometry/drgeo/default.nix +++ b/pkgs/applications/science/geometry/drgeo/default.nix @@ -1,5 +1,5 @@ args : with args; -let version = lib.getAttr ["version"] "1.1.0" args; in +let version = lib.attrByPath ["version"] "1.1.0" args; in rec { src = fetchurl { url = http://downloads.sourceforge.net/ofset/drgeo-1.1.0.tar.gz; diff --git a/pkgs/applications/virtualization/xen/default.nix b/pkgs/applications/virtualization/xen/default.nix index b039412499d..46625436798 100644 --- a/pkgs/applications/virtualization/xen/default.nix +++ b/pkgs/applications/virtualization/xen/default.nix @@ -4,7 +4,7 @@ let fetchurl = args.fetchurl; fullDepEntry = args.fullDepEntry; - version = lib.getAttr ["version"] "3.3.0" args; + version = lib.attrByPath ["version"] "3.3.0" args; _buildInputs = with args; [ python e2fsprogs gnutls pkgconfig libjpeg ncurses SDL libvncserver zlib graphviz ghostscript diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix index 6bf0955354a..12d0acb367a 100644 --- a/pkgs/applications/window-managers/stumpwm/default.nix +++ b/pkgs/applications/window-managers/stumpwm/default.nix @@ -6,7 +6,7 @@ let fullDepEntry = args.fullDepEntry; buildInputs = lib.attrVals ["clisp" "texinfo"] args; - version = lib.getAttr ["version"] "0.9.4.1" args; + version = lib.attrByPath ["version"] "0.9.4.1" args; pkgName = "stumpwm"; in |