diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2019-01-18 07:48:48 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-18 07:48:48 +0000 |
commit | 3ba707d228eb0646c8f367ca7e6282c6900162e2 (patch) | |
tree | 73bcb9fcb8bae96b955999313e656f81c01c9086 | |
parent | 119876990e405dc5d0487242223b7c7cc8e0f9dc (diff) | |
parent | 4f9e46af5d2371109d51863c8d772c4964dc401f (diff) | |
download | nixlib-3ba707d228eb0646c8f367ca7e6282c6900162e2.tar nixlib-3ba707d228eb0646c8f367ca7e6282c6900162e2.tar.gz nixlib-3ba707d228eb0646c8f367ca7e6282c6900162e2.tar.bz2 nixlib-3ba707d228eb0646c8f367ca7e6282c6900162e2.tar.lz nixlib-3ba707d228eb0646c8f367ca7e6282c6900162e2.tar.xz nixlib-3ba707d228eb0646c8f367ca7e6282c6900162e2.tar.zst nixlib-3ba707d228eb0646c8f367ca7e6282c6900162e2.zip |
Merge pull request #54163 from Mic92/racket
racket: fix drracket crashes on file dialogs
-rw-r--r-- | pkgs/development/interpreters/racket/default.nix | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index ba66404062be..15536c6370a3 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -10,6 +10,7 @@ , disableDocs ? false , CoreFoundation , gsettings-desktop-schemas +, wrapGAppsHook }: let @@ -59,7 +60,9 @@ stdenv.mkDerivation rec { (stdenv.lib.optionalString stdenv.isDarwin "-framework CoreFoundation") ]; - buildInputs = [ fontconfig libffi libtool makeWrapper sqlite gsettings-desktop-schemas gtk3 ] + nativeBuildInputs = [ wrapGAppsHook ]; + + buildInputs = [ fontconfig libffi libtool sqlite gsettings-desktop-schemas gtk3 ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv CoreFoundation ]; preConfigure = '' @@ -69,6 +72,8 @@ stdenv.mkDerivation rec { done mkdir src/build cd src/build + + gappsWrapperArgs+=("--prefix" "LD_LIBRARY_PATH" ":" $LD_LIBRARY_PATH) ''; shared = if stdenv.isDarwin then "dylib" else "shared"; @@ -80,13 +85,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; - postInstall = '' - for p in $(ls $out/bin/) ; do - wrapProgram $out/bin/$p \ - --prefix LD_LIBRARY_PATH ":" "${LD_LIBRARY_PATH}" \ - --prefix XDG_DATA_DIRS ":" "$GSETTINGS_SCHEMAS_PATH"; - done - ''; meta = with stdenv.lib; { description = "A programmable programming language"; |