diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-02-07 15:19:21 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-02-07 23:35:47 +0000 |
commit | e5013c05a2f845255debf94318ab38ecef1c186b (patch) | |
tree | bec11a0bd31d3432a16899e5539f1098f1c168a4 /nixpkgs/pkgs/applications/editors/texmacs | |
parent | 4fc07c92ec07cafcf6d56143ea7334693143ef88 (diff) | |
parent | 2d2f10475138b7206572dc3ec288184df2be022e (diff) | |
download | nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.gz nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.bz2 nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.lz nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.xz nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.tar.zst nixlib-e5013c05a2f845255debf94318ab38ecef1c186b.zip |
Merge commit '2d2f10475138b7206572dc3ec288184df2be022e'
Diffstat (limited to 'nixpkgs/pkgs/applications/editors/texmacs')
-rw-r--r-- | nixpkgs/pkgs/applications/editors/texmacs/default.nix | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/applications/editors/texmacs/default.nix b/nixpkgs/pkgs/applications/editors/texmacs/default.nix index d3d95e5886a5..ac5ac34d2145 100644 --- a/nixpkgs/pkgs/applications/editors/texmacs/default.nix +++ b/nixpkgs/pkgs/applications/editors/texmacs/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation { }; buildInputs = [ guile_1_8 qt4 makeWrapper ghostscriptX freetype ]; + NIX_LDFLAGS = [ "-lz" ]; postInstall = "wrapProgram $out/bin/texmacs --suffix PATH : " + (if ghostscriptX == null then "" else "${ghostscriptX}/bin:") + @@ -33,12 +34,6 @@ stdenv.mkDerivation { inherit (common) postPatch; - postFixup = '' - bin="$out/libexec/TeXmacs/bin/texmacs.bin" - rpath=$(patchelf --print-rpath "$bin") - patchelf --set-rpath "$rpath:${zlib.out}/lib" "$bin" - ''; - meta = common.meta // { maintainers = [ stdenv.lib.maintainers.roconnor ]; platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice |