chvp/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make sure java knows about javafx's dependencies

Browse source
This commit is contained in:
Charlotte Van Petegem 2020-03-05 17:16:04 +01:00
parent c4029f34f6
commit 63eb9d7e35
7 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
packages/node/default.nix
View file

@ -6,7 +6,6 @@
, system ? builtins.currentSystem , system ? builtins.currentSystem
, nodejs ? pkgs."nodejs-12_x" , nodejs ? pkgs."nodejs-12_x"
}: }:
let let
nodeEnv = import ./node-env.nix { nodeEnv = import ./node-env.nix {
inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;

3
packages/node/node-env.nix
View file

@ -1,7 +1,6 @@
# This file originates from node2nix # This file originates from node2nix
{ stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile }: { stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile }:
let let
python = if nodejs ? python then nodejs.python else python2; python = if nodejs ? python then nodejs.python else python2;
@ -393,7 +392,6 @@ let
, buildPhase ? "true" , buildPhase ? "true"
, ... , ...
}@args: }@args:
let let
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ]; extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ];
in in
@ -467,7 +465,6 @@ let
, buildPhase ? "true" , buildPhase ? "true"
, ... , ...
}@args: }@args:
let let
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];

1
packages/node/node-packages.nix
View file

@ -1,7 +1,6 @@
# This file has been generated by node2nix 1.7.0. Do not edit! # This file has been generated by node2nix 1.7.0. Do not edit!
{ nodeEnv, fetchurl, fetchgit, globalBuildInputs ? [] }: { nodeEnv, fetchurl, fetchgit, globalBuildInputs ? [] }:
let let
sources = { sources = {
"@babel/code-frame-7.8.3" = { "@babel/code-frame-7.8.3" = {

1
programs/neovim/base.nix
View file

@ -1,5 +1,4 @@
{ pkgs, ... }: { pkgs, ... }:
let let
customPlugins.snow-color-theme = pkgs.vimUtils.buildVimPlugin { customPlugins.snow-color-theme = pkgs.vimUtils.buildVimPlugin {
name = "snow"; name = "snow";

1
programs/sway/default.nix
View file

@ -1,6 +1,5 @@
with import <nixpkgs> {}; with import <nixpkgs> {};
{ pkgs, ... }: { pkgs, ... }:
let let
launcher = import ./launcher.nix { inherit pkgs stdenv; }; launcher = import ./launcher.nix { inherit pkgs stdenv; };
color-picker = import ./color-picker.nix { inherit pkgs; }; color-picker = import ./color-picker.nix { inherit pkgs; };

1
programs/sway/launcher.nix
View file

@ -1,5 +1,4 @@
{ pkgs, stdenv }: { pkgs, stdenv }:
let let
gemoji = pkgs.buildRubyGem { gemoji = pkgs.buildRubyGem {
pname = "gemoji"; pname = "gemoji";

10
shells/javafx.nix
View file

@ -2,9 +2,19 @@ let
pkgs = import <nixpkgs> {}; pkgs = import <nixpkgs> {};
baseVimConfig = import ../programs/neovim/base.nix { inherit pkgs; }; baseVimConfig = import ../programs/neovim/base.nix { inherit pkgs; };
jdtls = import ../packages/jdtls/default.nix { inherit pkgs; stdenv = pkgs.stdenv; }; jdtls = import ../packages/jdtls/default.nix { inherit pkgs; stdenv = pkgs.stdenv; };
extraRpath = pkgs.stdenv.lib.strings.makeLibraryPath (with pkgs; [ ffmpeg ]);
in in
pkgs.mkShell { pkgs.mkShell {
buildInputs = with pkgs; [ 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 jdk11
jdtls jdtls
openjfx11 openjfx11