Compare commits

...

3 Commits

@ -83,7 +83,7 @@
},
"locked": {
"lastModified": 1,
"narHash": "sha256-YiCIlI7ZJHG3PiAWrdbsWWVVsvaLImzLCw6FRvU0KHA=",
"narHash": "sha256-C/TiBeYELcAdkNg23vQtTs9q0K8GXG905iAtBUjQAF4=",
"path": "./pkgs",
"type": "path"
},

@ -0,0 +1,24 @@
{ fetchFromGitHub
, neovim-unwrapped
, luajit
, wrapNeovim
, xclip
, makeWrapper
, lib
}:
let version = "8a788e2";
in wrapNeovim (neovim-unwrapped.overrideAttrs (final: prev: {
src = fetchFromGitHub {
owner = "neovim";
repo = "neovim";
rev = version;
hash = "sha256-AZrOz2EYx2taNLwoMPdSx5LuGZoXcAiwRo5IratMRNA=";
};
buildInputs = prev.buildInputs ++ [ makeWrapper ];
postFixup = ''
wrapProgram "$out/bin/nvim" --prefix PATH : "${lib.makeBinPath [ xclip ]}"
'';
})) { }

@ -10,5 +10,6 @@ let pkgs = nixpkgs.legacyPackages.${system};
in {
eww = pkgs.callPackage ./eww { inherit buildRustPlatform; };
emacs = pkgs.callPackage (import ./emacs { inherit (pkgs) emacs; }) {};
neovim = pkgs.callPackage ./neovim {};
runelite = pkgs.callPackage ./runelite { inherit (develPkgs) maven; };
}

@ -4,16 +4,17 @@
, stdenv
, makeWrapper
, jre
, libnotify
}:
let version = "7426a5a"; # Keep these in sync
runeliteVersion = "1.10.6";
pluginHubVersion = "1.10.5";
let version = "c8914e7"; # Keep these in sync
runeliteVersion = "1.10.8";
pluginHubVersion = "1.10.7";
src = fetchFromGitHub {
owner = "runelite";
repo = "runelite";
rev = version;
hash = "sha256-mYFHDY7j8eL8e8voVi3UcSBR5MfmVn/Exc/xNkI74Xw=";
hash = "sha256-gfyJEXMYpnJosYuR5kxDIUomtKDbIT0cd0lWeh8i9CQ=";
};
in maven.buildMavenPackage rec {
inherit src version;
@ -22,7 +23,7 @@ in maven.buildMavenPackage rec {
buildInputs = [ maven makeWrapper ];
mvnParameters = "-DskipTests=true";
mvnHash = "sha256-6RxWzK9A8oJMH8NrjPAP9/N5bE6ti7Y+UFENU7r6enU=";
mvnHash = "sha256-fMQsbreRucEzZ4aYhHnjdKt+yTUwaEuUX3GWB22fp18=";
patches = [ ./my-hacks.patch ];
postPatch = ''
@ -38,6 +39,7 @@ in maven.buildMavenPackage rec {
"$out/share/java/runelite.jar"
makeWrapper "${jre}/bin/java" "$out/bin/runelite" \
--add-flags "-jar '$out/share/java/runelite.jar'"
--add-flags "-jar '$out/share/java/runelite.jar'" \
--prefix PATH : "${lib.makeBinPath [ libnotify ]}"
'';
}

@ -8,7 +8,7 @@
};
programs.gnupg.agent = {
enable = true;
pinentryFlavor = "qt";
pinentryFlavor = "gtk2";
};
programs.ssh = {

Loading…
Cancel
Save