talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

arcan.arcan: 0.6.1pre1+unstable=2021-09-05 -> 0.6.1pre1+unstable=2021-10-16

Browse Source
This commit is contained in:
AndersonTorres
2021-10-26 15:57:13 -03:00
parent cf87b5af96
commit 65e85478f3
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/desktops/arcan/arcan/default.nix
View File

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