diff --git a/pkgs/development/tools/misc/patchelf/new.nix b/pkgs/development/tools/misc/patchelf/new.nix new file mode 100644 index 00000000000..33afc6023ab --- /dev/null +++ b/pkgs/development/tools/misc/patchelf/new.nix @@ -0,0 +1,9 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "patchelf-0.2pre4979"; + src = fetchurl { + url = http://nix.cs.uu.nl/dist/nix/patchelf-0.2pre4979/patchelf-0.2pre4979.tar.bz2; + md5 = "d45a5a8e13fcef951556d351cc7a64a0"; + }; +} diff --git a/pkgs/evil/belastingdienst/builder.sh b/pkgs/evil/belastingdienst/builder.sh index d03ce7d309a..3eb001f9e7f 100644 --- a/pkgs/evil/belastingdienst/builder.sh +++ b/pkgs/evil/belastingdienst/builder.sh @@ -3,9 +3,12 @@ source $stdenv/setup buildPhase=buildPhase buildPhase() { glibc=$(cat $NIX_GCC/nix-support/orig-glibc) -# for i in bin/*; do -# patchelf --set-interpreter $glibc/lib/ld-linux.so.* $i -# done + for i in bin/*; do + patchelf \ + --set-interpreter $glibc/lib/ld-linux.so.* \ + --set-rpath $libX11/lib:$libXext/lib \ + $i + done } installPhase=installPhase diff --git a/pkgs/evil/belastingdienst/default.nix b/pkgs/evil/belastingdienst/default.nix index 535af82b588..8db1c8dfd43 100644 --- a/pkgs/evil/belastingdienst/default.nix +++ b/pkgs/evil/belastingdienst/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, patchelf, libX11, libXext}: stdenv.mkDerivation { name = "aangifte2005-1"; @@ -9,5 +9,6 @@ stdenv.mkDerivation { md5 = "9cc709b8ad041f4b20154ff1491d0436"; }; -# buildInputs = [pkgconfig gtk libpng]; + buildInputs = [patchelf]; + inherit libX11 libXext; } diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 21b5c983739..8b05fcc77c2 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -346,6 +346,10 @@ rec { inherit fetchurl stdenv; }; + patchelfNew = (import ../development/tools/misc/patchelf/new.nix) { + inherit fetchurl stdenv; + }; + gnum4 = (import ../development/tools/misc/gnum4) { inherit fetchurl stdenv; }; @@ -2321,6 +2325,8 @@ rec { aangifte2005 = import ../evil/belastingdienst { inherit stdenv fetchurl; + inherit (xlibs) libX11 libXext; + patchelf = patchelfNew; }; }