From 25ea790dd497a09381c3d125e7b616086ad608f9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 25 Mar 2010 19:40:19 +0000
Subject: [PATCH] * Added the Dutch Tax Return program for 2009.

svn path=/nixpkgs/trunk/; revision=20828
---
 .../taxes/aangifte-2009/default.nix           | 33 +++++++++++
 pkgs/top-level/all-packages.nix               | 56 +++++++++----------
 2 files changed, 61 insertions(+), 28 deletions(-)
 create mode 100644 pkgs/applications/taxes/aangifte-2009/default.nix

diff --git a/pkgs/applications/taxes/aangifte-2009/default.nix b/pkgs/applications/taxes/aangifte-2009/default.nix
new file mode 100644
index 00000000000..6d52783a641
--- /dev/null
+++ b/pkgs/applications/taxes/aangifte-2009/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, libX11, libXext, libSM }:
+
+stdenv.mkDerivation {
+  name = "aangifte2009-1";
+  
+  src = fetchurl {
+    url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2009_linux.tar.gz;
+    sha256 = "07l83cknzxwlzmg1w6baf2wqs06bh8v3949n51hy1p3wgr8hf408";
+  };
+
+  dontStrip = true;
+
+  buildPhase =
+    ''
+      for i in bin/*; do
+          patchelf \
+              --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
+              --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \
+              $i
+      done
+    '';
+
+  installPhase =
+    ''
+      ensureDir $out
+      cp -prvd * $out/
+    '';
+
+  meta = {
+    description = "Elektronische aangifte IB 2009 (Dutch Tax Return Program)";
+    url = http://www.belastingdienst.nl/particulier/aangifte2009/download/;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f98c194d635..baeb0ba6eee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -43,7 +43,7 @@ let config_ = config; in # rename the function argument
 
 let
 
-  lib = import ../lib; # see also libTests below
+  lib = import ../lib;
 
   # The contents of the configuration file found at $NIXPKGS_CONFIG or
   # $HOME/.nixpkgs/config.nix.
@@ -106,13 +106,13 @@ let
   # The package compositions.  Yes, this isn't properly indented.
   pkgsFun = __overrides: with helperFunctions; rec {
 
-  # override system. This is useful to build i686 packages on x86_64-linux
+  # Override system. This is useful to build i686 packages on x86_64-linux.
   forceSystem = system: (import ./all-packages.nix) {
     inherit system;
     inherit bootStdenv noSysDirs gccWithCC gccWithProfiling config;
   };
 
-  # used by wine, firefox with debugging version of Flash, ..
+  # Used by wine, firefox with debugging version of Flash, ...
   pkgsi686Linux = forceSystem "i686-linux";
 
   inherit __overrides;
@@ -6715,23 +6715,28 @@ let
 
 
   aangifte2005 = import ../applications/taxes/aangifte-2005 {
-    inherit stdenv fetchurl;
-    inherit (xlibs) libX11 libXext;
+    inherit (pkgsi686Linux) stdenv fetchurl;
+    inherit (pkgsi686Linux.xlibs) libX11 libXext;
   };
 
   aangifte2006 = import ../applications/taxes/aangifte-2006 {
-    inherit stdenv fetchurl;
-    inherit (xlibs) libX11 libXext;
+    inherit (pkgsi686Linux) stdenv fetchurl;
+    inherit (pkgsi686Linux.xlibs) libX11 libXext;
   };
 
   aangifte2007 = import ../applications/taxes/aangifte-2007 {
-    inherit stdenv fetchurl;
-    inherit (xlibs) libX11 libXext libSM;
+    inherit (pkgsi686Linux) stdenv fetchurl;
+    inherit (pkgsi686Linux.xlibs) libX11 libXext libSM;
   };
 
   aangifte2008 = import ../applications/taxes/aangifte-2008 {
-    inherit stdenv fetchurl;
-    inherit (xlibs) libX11 libXext libSM;
+    inherit (pkgsi686Linux) stdenv fetchurl;
+    inherit (pkgsi686Linux.xlibs) libX11 libXext libSM;
+  };
+
+  aangifte2009 = import ../applications/taxes/aangifte-2009 {
+    inherit (pkgsi686Linux) stdenv fetchurl;
+    inherit (pkgsi686Linux.xlibs) libX11 libXext libSM;
   };
 
   abcde = import ../applications/audio/abcde {
@@ -9274,25 +9279,20 @@ let
     inherit (pythonPackages) pysqlite;
   };
 
-   vice = import ../misc/emulators/vice {
-     inherit stdenv fetchurl lib perl gettext libpng giflib libjpeg alsaLib readline mesa;
-     inherit pkgconfig SDL makeDesktopItem autoconf automake;
-     inherit (gtkLibs) gtk;
-   };
+  vice = import ../misc/emulators/vice {
+    inherit stdenv fetchurl lib perl gettext libpng giflib libjpeg alsaLib readline mesa;
+    inherit pkgconfig SDL makeDesktopItem autoconf automake;
+    inherit (gtkLibs) gtk;
+  };
 
   wine =
-    if system == "x86_64-linux" then
-      # Can't build this in 64-bit; use a 32-bit build instead.
-      pkgsi686Linux.wine
-      # some hackery to make nix-env show this package on x86_64...
-      // {system = "x86_64-linux";}
-    else
-      import ../misc/emulators/wine {
-        inherit fetchurl stdenv bison mesa ncurses
-          libpng libjpeg alsaLib lcms xlibs freetype
-          fontconfig fontforge libxml2 libxslt openssl;
-	flex = flex2535;
-      };
+    # Wine cannot be built in 64-bit; use a 32-bit build instead.
+    import ../misc/emulators/wine {
+      inherit (pkgsi686Linux) fetchurl stdenv bison mesa ncurses
+        libpng libjpeg alsaLib lcms xlibs freetype
+        fontconfig fontforge libxml2 libxslt openssl;
+      flex = pkgsi686Linux.flex2535;
+    };
 
   xosd = import ../misc/xosd {
     inherit fetchurl stdenv;