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

arcanPackages.arcan: use new style for recursive attributes

Browse Source
This commit is contained in:
AndersonTorres
2022-08-03 22:11:51 -03:00
parent d61e4954ba
commit 9769e1b28a
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,14 +52,14 @@
, useStaticSqlite ? false , useStaticSqlite ? false
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "arcan" + lib.optionalString useStaticOpenAL "-static-openal"; pname = "arcan" + lib.optionalString useStaticOpenAL "-static-openal";
version = "0.6.2"; version = "0.6.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "letoram"; owner = "letoram";
repo = "arcan"; repo = "arcan";
rev = version; rev = finalAttrs.version;
hash = "sha256-Qwyt927eLqaCqJ4Lo4J1lQX2A24ke+AH52rmSCTnpO0="; hash = "sha256-Qwyt927eLqaCqJ4Lo4J1lQX2A24ke+AH52rmSCTnpO0=";
}; };
@@ -156,8 +156,8 @@ stdenv.mkDerivation rec {
substituteInPlace ./src/CMakeLists.txt --replace "SETUID" "# SETUID" substituteInPlace ./src/CMakeLists.txt --replace "SETUID" "# SETUID"
''; '';
# INFO: According to the source code, the manpages need to be generated before # INFO: Arcan build scripts require the manpages to be generated
# the configure phase # before the configure phase
preConfigure = lib.optionalString buildManPages '' preConfigure = lib.optionalString buildManPages ''
pushd doc pushd doc
ruby docgen.rb mangen ruby docgen.rb mangen
@@ -168,7 +168,7 @@ stdenv.mkDerivation rec {
"-DBUILD_PRESET=everything" "-DBUILD_PRESET=everything"
# The upstream project recommends tagging the distribution # The upstream project recommends tagging the distribution
"-DDISTR_TAG=Nixpkgs" "-DDISTR_TAG=Nixpkgs"
"-DENGINE_BUILDTAG=${version}" "-DENGINE_BUILDTAG=${finalAttrs.version}"
"-DHYBRID_SDL=on" "-DHYBRID_SDL=on"
"-DBUILTIN_LUA=${if useBuiltinLua then "on" else "off"}" "-DBUILTIN_LUA=${if useBuiltinLua then "on" else "off"}"
"-DDISABLE_JIT=${if useBuiltinLua then "on" else "off"}" "-DDISABLE_JIT=${if useBuiltinLua then "on" else "off"}"
@@ -196,4 +196,4 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ AndersonTorres ]; maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} })