diff options
| author | Shea Levy <shea@shealevy.com> | 2014-12-26 12:28:15 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2014-12-26 12:28:15 -0500 |
| commit | 05edd656f6bdecde31eb0270209cfc7e2320caad (patch) | |
| tree | 4b7c9eaf4d76874b7114015038ceb7d3e23b64bc /pkgs/games/dwarf-fortress | |
| parent | 28b6fb61e651a3e2cca57d087781e7ba6ab45e7c (diff) | |
| download | nixlib-05edd656f6bdecde31eb0270209cfc7e2320caad.tar nixlib-05edd656f6bdecde31eb0270209cfc7e2320caad.tar.gz nixlib-05edd656f6bdecde31eb0270209cfc7e2320caad.tar.bz2 nixlib-05edd656f6bdecde31eb0270209cfc7e2320caad.tar.lz nixlib-05edd656f6bdecde31eb0270209cfc7e2320caad.tar.xz nixlib-05edd656f6bdecde31eb0270209cfc7e2320caad.tar.zst nixlib-05edd656f6bdecde31eb0270209cfc7e2320caad.zip | |
Missed gcc refs
Diffstat (limited to 'pkgs/games/dwarf-fortress')
| -rw-r--r-- | pkgs/games/dwarf-fortress/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index 5756611df20a..8b4e8bfce828 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { # Store the original hash for dwarf-therapist echo $(md5sum $out/share/df_linux/libs/Dwarf_Fortress | cut -c1-8) > $out/share/df_linux/hash.md5.orig # Fix rpath - patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc stdenv.glibc ]}:$out/share/df_linux/libs" $out/share/df_linux/libs/Dwarf_Fortress + patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.gcc stdenv.glibc ]}:$out/share/df_linux/libs" $out/share/df_linux/libs/Dwarf_Fortress cp -f ./git-export/build/libgraphics.so $out/share/df_linux/libs/libgraphics.so cp $permission $out/share/df_linux/nix_permission @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { done # now run Dwarf Fortress! - export LD_LIBRARY_PATH=\${stdenv.gcc}/lib:${SDL}/lib:${SDL_image}/lib/:${SDL_ttf}/lib/:${gtk2}/lib/:${glib}/lib/:${mesa}/lib/:${openal}/lib/:${libsndfile}/lib:\$DF_DIR/df_linux/libs/ + export LD_LIBRARY_PATH=\${stdenv.cc}/lib:${SDL}/lib:${SDL_image}/lib/:${SDL_ttf}/lib/:${gtk2}/lib/:${glib}/lib/:${mesa}/lib/:${openal}/lib/:${libsndfile}/lib:\$DF_DIR/df_linux/libs/ export SDL_DISABLE_LOCK_KEYS=1 # Work around for bug in Debian/Ubuntu SDL patch. #export SDL_VIDEO_CENTERED=1 # Centre the screen. Messes up resizing. |