Unverified Commit 0c657495 authored by Anderson Torres's avatar Anderson Torres Committed by GitHub
Browse files

Merge pull request #216255 from atorres1985-contrib/arcan 

Arcan updates
parents 359a46e7 f60c5a80

pkgs/desktops/arcan/arcan/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -56,14 +56,14 @@ let 
  cmakeFeatureFlag = feature: flag:

    "-D${feature}=${if flag then "on" else "off"}";

in

stdenv.mkDerivation (finalAttrs: {

stdenv.mkDerivation (self: {

  pname = "arcan" + lib.optionalString useStaticOpenAL "-static-openal";

  version = "0.6.2.1";



  src = fetchFromGitHub {

    owner = "letoram";

    repo = "arcan";

    rev = finalAttrs.version;

    rev = self.version;

    hash = "sha256-7H3fVSsW5VANLqwhykY+Q53fPjz65utaGksh/OpZnJM=";

  };
@@ -172,7 +172,7 @@ stdenv.mkDerivation (finalAttrs: { 
    "-DBUILD_PRESET=everything"

    # The upstream project recommends tagging the distribution

    "-DDISTR_TAG=Nixpkgs"

    "-DENGINE_BUILDTAG=${finalAttrs.version}"

    "-DENGINE_BUILDTAG=${self.version}"

    (cmakeFeatureFlag "HYBRID_SDL" true)

    (cmakeFeatureFlag "BUILTIN_LUA" useBuiltinLua)

    (cmakeFeatureFlag "DISABLE_JIT" useBuiltinLua)

pkgs/desktops/arcan/cat9/default.nix

+6 −6
Original line number Diff line number Diff line
@@ -3,15 +3,15 @@ 
, fetchFromGitHub

}:



stdenvNoCC.mkDerivation (finalPackages: {

stdenvNoCC.mkDerivation (self: {

  pname = "cat9";

  version = "unstable-2018-09-13";

  version = "unstable-2023-02-11";



  src = fetchFromGitHub {

    owner = "letoram";

    repo = finalPackages.pname;

    rev = "754d9d2900d647a0fa264720528117471a32f295";

    hash = "sha256-UmbynVOJYvHz+deA99lj/BBFOauZzwSNs+qR28pASPY=";

    repo = "cat9";

    rev = "1da9949c728e0734a883d258a8a05ca0e3dd5897";

    hash = "sha256-kit+H9u941oK2Ko8S/1w+3DN6ktnfBtd+3s9XgU+qOQ=";

  };



  dontConfigure = true;
@@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation (finalPackages: { 
  meta = with lib; {

    homepage = "https://github.com/letoram/cat9";

    description = "A User shell for LASH";

    license = licenses.bsd3;

    license = licenses.unlicense;

    maintainers = with maintainers; [ AndersonTorres ];

    platforms = platforms.all;

  };

pkgs/desktops/arcan/durden/default.nix

+4 −4
Original line number Diff line number Diff line
@@ -3,15 +3,15 @@ 
, fetchFromGitHub

}:



stdenvNoCC.mkDerivation (finalPackages: {

stdenvNoCC.mkDerivation (self: {

  pname = "durden";

  version = "unstable-2022-10-16";

  version = "unstable-2023-01-19";



  src = fetchFromGitHub {

    owner = "letoram";

    repo = "durden";

    rev = "728a9f09ac8b306ab2619b4e2ec4f48decf1b7a8";

    hash = "sha256-ckOKdrz232Q6hAyFC2mAyZQLNuuR8JbVhbLy32qFn1o=";

    rev = "bba1bcc8992ea5826fd3b1c798cb271141b7c8e2";

    hash = "sha256-PK9ObMJ3SbHZLnLjxk4smh5N0WaM/2H/Y+T5vKBdHWA=";

  };



  dontConfigure = true;

pkgs/desktops/arcan/pipeworld/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -5,13 +5,13 @@ 


stdenvNoCC.mkDerivation (finalPackages: {

  pname = "pipeworld";

  version = "unstable-2022-04-03";

  version = "unstable-2023-02-05";



  src = fetchFromGitHub {

    owner = "letoram";

    repo = "pipeworld";

    rev = "f60d0b93fcd5462f47b1c928c109f5b4cbd74eef";

    hash = "sha256-PNziP5LaUODZwtAHvg8uYt/EyoD3mB5aWIfp7n5a82E=";

    rev = "58b2e9fe15ef0baa4b04c27079bfa386ec62b28e";

    hash = "sha256-PbKejghMkLZdeQJD9fObw9xhGH24IX72X7pyjapTXJM=";

  };



  dontConfigure = true;

pkgs/desktops/arcan/prio/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -3,13 +3,13 @@ 
, fetchFromGitHub

}:



stdenvNoCC.mkDerivation (finalPackages: {

stdenvNoCC.mkDerivation (self: {

  pname = "prio";

  version = "unstable-2018-09-13";



  src = fetchFromGitHub {

    owner = "letoram";

    repo = finalPackages.pname;

    repo = "prio";

    rev = "c3f97491339d15f063d6937d5f89bcfaea774dd1";

    hash = "sha256-Idv/duEYmDk/rO+TI8n+FY3VFDtUEh8C292jh12BJuM=";

  };