diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2012-08-10 15:02:19 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2012-08-10 15:02:19 +0200 |
| commit | d10772ec8a4d3f2bd24f663d4c317429c46389a8 (patch) | |
| tree | da2c992ecc2cd5cfd866090107d46bc3a4b7da9d /pkgs/development/tools/boomerang | |
| parent | a6e266306f5852a850ce4838dc1634622ad6122b (diff) | |
boomerang: Fix prefix in dlopen().
We already have the correct library dir in our search path, so we don't need to prepend lib/ again.
Diffstat (limited to 'pkgs/development/tools/boomerang')
| -rw-r--r-- | pkgs/development/tools/boomerang/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/tools/boomerang/dlopen_path.patch | 13 |
2 files changed, 15 insertions, 0 deletions
diff --git a/pkgs/development/tools/boomerang/default.nix b/pkgs/development/tools/boomerang/default.nix index 0f9035f9d3919..eadeb51d1b391 100644 --- a/pkgs/development/tools/boomerang/default.nix +++ b/pkgs/development/tools/boomerang/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation { install -vD boomerang "$out/bin/boomerang" ''; + patches = [ ./dlopen_path.patch ]; + src = fetchgit { url = "git://github.com/aszlig/boomerang.git"; rev = "d0b147a5dfc915a5fa8fe6c517e66a049a37bf22"; diff --git a/pkgs/development/tools/boomerang/dlopen_path.patch b/pkgs/development/tools/boomerang/dlopen_path.patch new file mode 100644 index 0000000000000..1e4bf3c75a302 --- /dev/null +++ b/pkgs/development/tools/boomerang/dlopen_path.patch @@ -0,0 +1,13 @@ +diff --git a/loader/BinaryFileFactory.cpp b/loader/BinaryFileFactory.cpp +index 889a4ed..ca86765 100644 +--- a/loader/BinaryFileFactory.cpp ++++ b/loader/BinaryFileFactory.cpp +@@ -109,7 +109,7 @@ BinaryFile* BinaryFileFactory::getInstanceFor( const char *sName ) { + + // Load the specific loader library + #ifndef _WIN32 // Cygwin, Unix/Linux +- libName = std::string("lib/lib") + libName; ++ libName = std::string("lib") + libName; + #ifdef __CYGWIN__ + libName += ".dll"; // Cygwin wants .dll, but is otherwise like Unix + #else |