Merge pull request #143042 from AndersonTorres/new-arcan

arcan updates

pkgs/desktops/arcan/arcan/default.nix

@@ -36,7 +36,7 @@
 , xcbutil
 , xcbutilwm
 , xz
-, buildManPages ? true, ruby
+, buildManpages ? true, ruby
 }:
 
 let
@@ -52,21 +52,21 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "arcan";
-  version = "0.6.1pre1+unstable=2021-09-05";
+  version = "0.6.1pre1+unstable=2021-10-16";
 
   src = fetchFromGitHub {
     owner = "letoram";
     repo = "arcan";
-    rev = "525521177e4458199d7a57f8e6d37d41c04a988d";
-    hash = "sha256-RsvTHPIvF9TeOfjPGcArptIiF9g42BfZkVMCbjJcXnE=";
+    rev = "e0182b944152fbcb49f5c16932d38c05a9fb2680";
+    hash = "sha256-4FodFuO51ehvyjH4YaF/xBY9dwA6cP/e6/BvEsH4w7U=";
   };
 
   postUnpack = ''
-    (
-     cd $sourceRoot/external/git/
-     cp -a ${letoram-openal-src}/ openal/
-     chmod --recursive 744 openal/
-    )
+    pushd .
+    cd $sourceRoot/external/git/
+    cp -a ${letoram-openal-src}/ openal/
+    chmod --recursive 744 openal/
+    popd
   '';
 
   # TODO: work with upstream in order to get rid of these hardcoded paths
@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
     cmake
     makeWrapper
     pkg-config
-  ] ++ lib.optionals buildManPages [
+  ] ++ lib.optionals buildManpages [
     ruby
   ];
 
@@ -123,8 +123,11 @@ stdenv.mkDerivation rec {
 
   # INFO: According to the source code, the manpages need to be generated before
   # the configure phase
-  preConfigure = lib.optionalString buildManPages ''
-    (cd doc; ruby docgen.rb mangen)
+  preConfigure = lib.optionalString buildManpages ''
+    pushd .
+    cd doc
+    ruby docgen.rb mangen
+    popd
   '';
 
   cmakeFlags = [

pkgs/desktops/arcan/default.nix

@@ -9,25 +9,26 @@ rec {
 
   # Arcan
 
-  arcan = callPackage ./arcan.nix { };
+  arcan = callPackage ./arcan { };
   arcan-wrapped = callPackage ./wrapper.nix { };
-  xarcan = callPackage ./xarcan.nix { };
+  xarcan = callPackage ./xarcan { };
 
   # Appls
 
-  durden = callPackage ./durden.nix { };
+  durden = callPackage ./durden { };
   durden-wrapped = callPackage ./wrapper.nix {
     name = "durden-wrapped";
     appls = [ durden ];
   };
 
-  pipeworld = callPackage ./pipeworld.nix { };
+  pipeworld = callPackage ./pipeworld { };
   pipeworld-wrapped = callPackage ./wrapper.nix {
     name = "pipeworld-wrapped";
     appls = [ pipeworld ];
   };
 
-  prio = callPackage ./prio.nix { };
+  # Warning: prio is deprecated; however it works and is useful for testing
+  prio = callPackage ./prio { };
   prio-wrapped = callPackage ./wrapper.nix {
     name = "prio-wrapped";
     appls = [ prio ];

pkgs/desktops/arcan/durden/default.nix

@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   pname = "durden";
-  version = "0.6.1+unstable=2021-07-11";
+  version = "0.6.1+unstable=2021-10-15";
 
   src = fetchFromGitHub {
     owner = "letoram";
     repo = pname;
-    rev = "8e0a5c07cade9ad9f606781615c9ebae7b28b6d5";
-    hash = "sha256-4cGuCAeYmmr4ACWt2akVQu2cPqqyE6p+XFaKWcFf3t0=";
+    rev = "ab6cdaf19e87b74895a9ab5e1d005a07ea9396a6";
+    hash = "sha256-FxqY1TUgbD/PjQjTZZerb7ngn5nkcqmVwqPvbRAYaqo=";
   };
 
   installPhase = ''

pkgs/desktops/arcan/wrapper.nix

@@ -24,6 +24,6 @@ symlinkJoin rec {
     done
   '';
 }
-# TODO: set ARCAN_FONTPATH to a set of fonts that can be provided in a parameter
 # TODO: set ARCAN_STATEBASEPATH to $HOME/.arcan/resources/savestates/ - possibly
 # via a suitable script
+# TODO: set ARCAN_FONTPATH to a set of default-but-configurable fontset