Make sure java knows about javafx's dependencies
This commit is contained in:
parent
c4029f34f6
commit
63eb9d7e35
7 changed files with 10 additions and 8 deletions
|
@ -6,7 +6,6 @@
|
|||
, system ? builtins.currentSystem
|
||||
, nodejs ? pkgs."nodejs-12_x"
|
||||
}:
|
||||
|
||||
let
|
||||
nodeEnv = import ./node-env.nix {
|
||||
inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
# This file originates from node2nix
|
||||
|
||||
{ stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile }:
|
||||
|
||||
let
|
||||
python = if nodejs ? python then nodejs.python else python2;
|
||||
|
||||
|
@ -393,7 +392,6 @@ let
|
|||
, buildPhase ? "true"
|
||||
, ...
|
||||
}@args:
|
||||
|
||||
let
|
||||
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ];
|
||||
in
|
||||
|
@ -467,7 +465,6 @@ let
|
|||
, buildPhase ? "true"
|
||||
, ...
|
||||
}@args:
|
||||
|
||||
let
|
||||
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
|
||||
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
# This file has been generated by node2nix 1.7.0. Do not edit!
|
||||
|
||||
{ nodeEnv, fetchurl, fetchgit, globalBuildInputs ? [] }:
|
||||
|
||||
let
|
||||
sources = {
|
||||
"@babel/code-frame-7.8.3" = {
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
{ pkgs, ... }:
|
||||
|
||||
let
|
||||
customPlugins.snow-color-theme = pkgs.vimUtils.buildVimPlugin {
|
||||
name = "snow";
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
with import <nixpkgs> {};
|
||||
{ pkgs, ... }:
|
||||
|
||||
let
|
||||
launcher = import ./launcher.nix { inherit pkgs stdenv; };
|
||||
color-picker = import ./color-picker.nix { inherit pkgs; };
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
{ pkgs, stdenv }:
|
||||
|
||||
let
|
||||
gemoji = pkgs.buildRubyGem {
|
||||
pname = "gemoji";
|
||||
|
|
|
@ -2,9 +2,19 @@ let
|
|||
pkgs = import <nixpkgs> {};
|
||||
baseVimConfig = import ../programs/neovim/base.nix { inherit pkgs; };
|
||||
jdtls = import ../packages/jdtls/default.nix { inherit pkgs; stdenv = pkgs.stdenv; };
|
||||
|
||||
extraRpath = pkgs.stdenv.lib.strings.makeLibraryPath (with pkgs; [ ffmpeg ]);
|
||||
in
|
||||
pkgs.mkShell {
|
||||
buildInputs = with pkgs; [
|
||||
(
|
||||
pkgs.writeScriptBin "java" ''
|
||||
#!${pkgs.zsh}/bin/zsh
|
||||
|
||||
old_path="$(patchelf --print-rpath ${jdk11}/bin/java)"
|
||||
LD_LIBRARY_PATH="$old_path:${extraRpath}" ${jdk11}/bin/java $@
|
||||
''
|
||||
)
|
||||
jdk11
|
||||
jdtls
|
||||
openjfx11
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue