Commit 9f6bddf4 authored by Philip Abernethy's avatar Philip Abernethy Committed by Kira Bruneau
Browse files

goverlay: 0.7.1 -> 1.2

parent b8f8d83d

pkgs/tools/graphics/goverlay/default.nix

+12 −29
Original line number Diff line number Diff line
@@ -3,12 +3,12 @@ 
  stdenv,

  fetchFromGitHub,

  bash,

  breeze-qt5,

  coreutils,

  fpc,

  git,

  gnugrep,

  lazarus-qt5,

  iproute2,

  lazarus-qt6,

  libGL,

  libGLU,

  libnotify,
@@ -17,36 +17,23 @@ 
  nix-update-script,

  polkit,

  procps,

  qt6,

  systemd,

  util-linux,

  vulkan-tools,

  which,

  wrapQtAppsHook,

  writeScriptBin,

}:



let

  # Finds data files using the XDG Base Directory Specification

  # See https://specifications.freedesktop.org/basedir-spec/latest

  find-xdg-data-files = writeScriptBin "find-xdg-data-files" ''

    #!${bash}/bin/sh

    IFS=:

    for xdg_data_dir in ''${XDG_DATA_HOME:-$HOME/.local/share}:''${XDG_DATA_DIRS:-/usr/local/share:/usr/share}; do

      if [ -f "$xdg_data_dir/$1" ]; then

        echo "$xdg_data_dir/$1"

      fi

    done

  '';

in

stdenv.mkDerivation rec {

  pname = "goverlay";

  version = "0.7.1";

  version = "1.2";



  src = fetchFromGitHub {

    owner = "benjamimgois";

    repo = pname;

    rev = version;

    sha256 = "sha256-oXkGrMHjs8uui0pzGYW8jnttet/5IX0r8eat0n5saFk=";

    sha256 = "sha256-tSpM+XLlFQLfL750LTNWbWFg1O+0fSfsPRXuRCm/KlY=";

  };



  outputs = [
@@ -54,38 +41,35 @@ stdenv.mkDerivation rec { 
    "man"

  ];



  patches = [

    # Find MangoHud & vkBasalt Vulkan layers using the XDG Base Directory Specification

    ./find-xdg-data-files.patch

  ];



  postPatch = ''

    substituteInPlace Makefile \

      --replace 'prefix = /usr/local' "prefix = $out"

      --replace-fail 'prefix = /usr/local' "prefix = $out"



    substituteInPlace overlayunit.pas \

      --replace '/usr/share/icons/hicolor/128x128/apps/goverlay.png' "$out/share/icons/hicolor/128x128/apps/goverlay.png"

      --replace-fail '/usr/share/icons/hicolor/128x128/apps/goverlay.png' "$out/share/icons/hicolor/128x128/apps/goverlay.png" \

      --replace-fail '/sbin/ip' "${lib.getExe' iproute2 "ip"}" \

      --replace-fail '/bin/bash' "${lib.getExe' bash "bash"}"

  '';



  nativeBuildInputs = [

    fpc

    lazarus-qt5

    lazarus-qt6

    wrapQtAppsHook

  ];



  buildInputs = [

    breeze-qt5

    libGL

    libGLU

    libqtpas

    libX11

    qt6.qtbase

  ];



  NIX_LDFLAGS = "-lGLU -rpath ${lib.makeLibraryPath buildInputs}";



  buildPhase = ''

    runHook preBuild

    HOME=$(mktemp -d) lazbuild --lazarusdir=${lazarus-qt5}/share/lazarus -B goverlay.lpi

    HOME=$(mktemp -d) lazbuild --lazarusdir=${lazarus-qt6}/share/lazarus -B goverlay.lpi

    runHook postBuild

  '';
@@ -94,7 +78,6 @@ stdenv.mkDerivation rec { 
      lib.makeBinPath [

        bash

        coreutils

        find-xdg-data-files

        git

        gnugrep

        libnotify

pkgs/top-level/all-packages.nix

+2 −3
Original line number Diff line number Diff line
@@ -3581,9 +3581,8 @@ with pkgs; 














  gdown = with python3Packages; toPythonApplication gdown;



























  goverlay = callPackage ../tools/graphics/goverlay {













    inherit (libsForQt5) libqtpas wrapQtAppsHook;













    inherit (plasma5Packages) breeze-qt5;













  goverlay = qt6Packages.callPackage ../tools/graphics/goverlay {













    inherit (qt6Packages) libqtpas wrapQtAppsHook;















  };





























  gpt4all-cuda = gpt4all.override {