Unverified Commit 683fac20 authored by John Titor's avatar John Titor
Browse files

openrgb: switch to finalAttrs 



Recursively importing openrgb package again is just bad
and breaks overrides. ie, even if we override the openrgb.src,
passthru.withPlugins may still be using the previous version

Signed-off-by: default avatarJohn Titor <50095635+JohnRTitor@users.noreply.github.com>
parent 63b41694

pkgs/by-name/op/openrgb/package.nix

+5 −6
Original line number Diff line number Diff line
@@ -9,17 +9,16 @@ 
  coreutils,

  mbedtls_2,

  symlinkJoin,

  openrgb,

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "openrgb";

  version = "0.9";



  src = fetchFromGitLab {

    owner = "CalcProgrammer1";

    repo = "OpenRGB";

    rev = "release_${version}";

    rev = "release_${finalAttrs.version}";

    hash = "sha256-XBLj4EfupyeVHRc0pVI7hrXFoCNJ7ak2yO0QSfhBsGU=";

  };
@@ -40,7 +39,7 @@ stdenv.mkDerivation rec { 
  postPatch = ''

    patchShebangs scripts/build-udev-rules.sh

    substituteInPlace scripts/build-udev-rules.sh \

      --replace /bin/chmod "${coreutils}/bin/chmod"

      --replace-fail /bin/chmod "${coreutils}/bin/chmod"

  '';



  doInstallCheck = true;
@@ -67,7 +66,7 @@ stdenv.mkDerivation rec { 
        '';

      };

    in

    openrgb.overrideAttrs (old: {

    finalAttrs.finalPackage.overrideAttrs (old: {

      qmakeFlags = old.qmakeFlags or [ ] ++ [

        # Welcome to Escape Hell, we have backslashes

        ''DEFINES+=OPENRGB_EXTRA_PLUGIN_DIRECTORY=\\\""${
@@ -84,4 +83,4 @@ stdenv.mkDerivation rec { 
    platforms = platforms.linux;

    mainProgram = "openrgb";

  };

}
 
})