diff --git a/packages/node/default.nix b/packages/node/default.nix index 61cabd96..487bf3c7 100644 --- a/packages/node/default.nix +++ b/packages/node/default.nix @@ -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; diff --git a/packages/node/node-env.nix b/packages/node/node-env.nix index 23f636f7..77e17089 100644 --- a/packages/node/node-env.nix +++ b/packages/node/node-env.nix @@ -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" ]; diff --git a/packages/node/node-packages.nix b/packages/node/node-packages.nix index 0d9671fb..e9788078 100644 --- a/packages/node/node-packages.nix +++ b/packages/node/node-packages.nix @@ -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" = { diff --git a/programs/neovim/base.nix b/programs/neovim/base.nix index 4b572e2c..16a0540d 100644 --- a/programs/neovim/base.nix +++ b/programs/neovim/base.nix @@ -1,5 +1,4 @@ { pkgs, ... }: - let customPlugins.snow-color-theme = pkgs.vimUtils.buildVimPlugin { name = "snow"; diff --git a/programs/sway/default.nix b/programs/sway/default.nix index f1e28d9d..f185ab36 100644 --- a/programs/sway/default.nix +++ b/programs/sway/default.nix @@ -1,6 +1,5 @@ with import {}; { pkgs, ... }: - let launcher = import ./launcher.nix { inherit pkgs stdenv; }; color-picker = import ./color-picker.nix { inherit pkgs; }; diff --git a/programs/sway/launcher.nix b/programs/sway/launcher.nix index 23d17bcf..d681766c 100644 --- a/programs/sway/launcher.nix +++ b/programs/sway/launcher.nix @@ -1,5 +1,4 @@ { pkgs, stdenv }: - let gemoji = pkgs.buildRubyGem { pname = "gemoji"; diff --git a/shells/javafx.nix b/shells/javafx.nix index be23eef5..30b92b0b 100644 --- a/shells/javafx.nix +++ b/shells/javafx.nix @@ -2,9 +2,19 @@ let pkgs = import {}; 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