From 48676d0ad60b7fd279605c397f2c58b41decc836 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Fri, 16 Jul 2021 09:38:58 -0300 Subject: [PATCH 1/4] arcan: fix wrapper The wrapper should read the user's HOME directory, but it reads the 'homeless-shelter'. --- pkgs/desktops/arcan/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/arcan/wrapper.nix b/pkgs/desktops/arcan/wrapper.nix index a8b93ca1deac..4368b0ad3a59 100644 --- a/pkgs/desktops/arcan/wrapper.nix +++ b/pkgs/desktops/arcan/wrapper.nix @@ -21,7 +21,7 @@ symlinkJoin rec { --set ARCAN_LIBPATH "${placeholder "out"}/lib/" \ --set ARCAN_RESOURCEPATH "${placeholder "out"}/share/arcan/resources/" \ --set ARCAN_SCRIPTPATH "${placeholder "out"}/share/arcan/scripts/" \ - --set ARCAN_STATEBASEPATH "$HOME/.arcan/resources/savestates/" + --set ARCAN_STATEBASEPATH "\$HOME/.arcan/resources/savestates/" done ''; } From 6c539fa80782e483c12ebf6b46c89e091f3462a4 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Fri, 16 Jul 2021 09:40:39 -0300 Subject: [PATCH 2/4] arcan: remove prio from everyone-wrapped inputs Prio works well, but it is not actively developed by upstream. --- pkgs/desktops/arcan/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/arcan/default.nix b/pkgs/desktops/arcan/default.nix index dba284f0100d..874035c4801e 100644 --- a/pkgs/desktops/arcan/default.nix +++ b/pkgs/desktops/arcan/default.nix @@ -37,6 +37,6 @@ rec { everyone-wrapped = callPackage ./wrapper.nix { name = "everyone-wrapped"; - appls = [ durden pipeworld prio ]; + appls = [ durden pipeworld ]; }; } From cca4ad5b524984977c4da3216ee62e0999b0d7cc Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Fri, 16 Jul 2021 10:20:08 -0300 Subject: [PATCH 3/4] arcan.arcan: 0.6.1pre1+unstable=2021-07-07 -> 0.6.1pre1+unstable=2021-07-10 --- pkgs/desktops/arcan/arcan.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/arcan/arcan.nix b/pkgs/desktops/arcan/arcan.nix index 8a30da9e81f2..c6a57ecc3bda 100644 --- a/pkgs/desktops/arcan/arcan.nix +++ b/pkgs/desktops/arcan/arcan.nix @@ -52,13 +52,13 @@ let in stdenv.mkDerivation rec { pname = "arcan"; - version = "0.6.1pre1+unstable=2021-07-07"; + version = "0.6.1pre1+unstable=2021-07-10"; src = fetchFromGitHub { owner = "letoram"; repo = "arcan"; - rev = "f3341ab94b32d02f3d15c3b91a512b2614e950a5"; - hash = "sha256-YBtRA5uCk4tjX3Bsu5vMkaNaCLRlM6HVQ53sna3gDsY="; + rev = "25da999e6e03688c71c7df3852314c01ed610e0d"; + hash = "sha256-+ZF6mD/Z0N/5QCjXe80z4L6JOE33+Yv4ZlwKvlG/c44="; }; postUnpack = '' From a6ae85a346431e966e266467bd195cc16649f13f Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Fri, 16 Jul 2021 10:21:18 -0300 Subject: [PATCH 4/4] arcan.durden: 0.6.1+unstable=2021-06-25 -> 0.6.1+unstable=2021-07-11 --- pkgs/desktops/arcan/durden.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/arcan/durden.nix b/pkgs/desktops/arcan/durden.nix index cfe41cb6ec22..f6837f96fb6b 100644 --- a/pkgs/desktops/arcan/durden.nix +++ b/pkgs/desktops/arcan/durden.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "durden"; - version = "0.6.1+unstable=2021-06-25"; + version = "0.6.1+unstable=2021-07-11"; src = fetchFromGitHub { owner = "letoram"; repo = pname; - rev = "fb618fccc57a68b6ce933b4df5822acd1965d591"; - hash = "sha256-PovI837Xca4wV0g0s4tYUMFGVUDf+f8HcdvM1+0aDxk="; + rev = "8e0a5c07cade9ad9f606781615c9ebae7b28b6d5"; + hash = "sha256-4cGuCAeYmmr4ACWt2akVQu2cPqqyE6p+XFaKWcFf3t0="; }; installPhase = ''