diff options
Diffstat (limited to 'pkgs/tools/graphics')
-rw-r--r-- | pkgs/tools/graphics/goverlay/default.nix | 20 | ||||
-rw-r--r-- | pkgs/tools/graphics/goverlay/find-xdg-data-files.patch | 10 | ||||
-rw-r--r-- | pkgs/tools/graphics/netpbm/default.nix | 6 |
3 files changed, 19 insertions, 17 deletions
diff --git a/pkgs/tools/graphics/goverlay/default.nix b/pkgs/tools/graphics/goverlay/default.nix index 2296743694ee2..daddc4947df5c 100644 --- a/pkgs/tools/graphics/goverlay/default.nix +++ b/pkgs/tools/graphics/goverlay/default.nix @@ -5,14 +5,15 @@ , fetchFromGitHub , fpc , lazarus-qt -, qt5 -, libX11 +, wrapQtAppsHook +, libGL +, libGLU , libqt5pas +, libX11 , coreutils , git , gnugrep , libnotify -, mesa-demos , polkit , procps , systemd @@ -34,13 +35,13 @@ let ''; in stdenv.mkDerivation rec { pname = "goverlay"; - version = "0.6"; + version = "0.6.3"; src = fetchFromGitHub { owner = "benjamimgois"; repo = pname; rev = version; - hash = "sha256-E4SMUL9rpDSSdprX4fPyGCHCowdQavjhGIhV3r4jeiw="; + hash = "sha256-ZksQse0xWAtH+U6EjcGWT2BOG5dfSnm6XvZLLE5ynHs="; }; outputs = [ "out" "man" ]; @@ -61,15 +62,17 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ fpc lazarus-qt - qt5.wrapQtAppsHook + wrapQtAppsHook ]; buildInputs = [ - libX11 + libGL + libGLU libqt5pas + libX11 ]; - NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}"; + NIX_LDFLAGS = "-lGLU -rpath ${lib.makeLibraryPath buildInputs}"; buildPhase = '' runHook preBuild @@ -85,7 +88,6 @@ in stdenv.mkDerivation rec { git gnugrep libnotify - mesa-demos polkit procps systemd diff --git a/pkgs/tools/graphics/goverlay/find-xdg-data-files.patch b/pkgs/tools/graphics/goverlay/find-xdg-data-files.patch index 51d4dcdc54ede..e29507980adb3 100644 --- a/pkgs/tools/graphics/goverlay/find-xdg-data-files.patch +++ b/pkgs/tools/graphics/goverlay/find-xdg-data-files.patch @@ -1,8 +1,8 @@ diff --git a/overlayunit.pas b/overlayunit.pas -index de8725f..005f171 100644 +index a56cea7..9a4f547 100644 --- a/overlayunit.pas +++ b/overlayunit.pas -@@ -5377,7 +5377,7 @@ begin +@@ -4880,7 +4880,7 @@ begin //Determine Mangohud dependency status //locate MangoHud and store result in tmp folder @@ -11,7 +11,7 @@ index de8725f..005f171 100644 // Assign Text file dependency_mangohud to variable mangohudVAR AssignFile(mangohudVAR, '/tmp/goverlay/dependency_mangohud'); -@@ -5386,7 +5386,7 @@ begin +@@ -4889,7 +4889,7 @@ begin CloseFile(mangohudVAR); // Read String and store value on mangohuddependencyVALUE based on result @@ -20,7 +20,7 @@ index de8725f..005f171 100644 mangohuddependencyVALUE := 1 else mangohuddependencyVALUE := 0; -@@ -5395,7 +5395,7 @@ begin +@@ -4898,7 +4898,7 @@ begin //Determine vkBasalt dependency staus //locate vkBasalt and store result in tmp folder @@ -29,7 +29,7 @@ index de8725f..005f171 100644 // Assign Text file dependency_mangohud to variable mangohudVAR AssignFile(vkbasaltVAR, '/tmp/goverlay/dependency_vkbasalt'); -@@ -5404,7 +5404,7 @@ begin +@@ -4907,7 +4907,7 @@ begin CloseFile(vkbasaltVAR); // Read String and store value on vkbasaltdependencyVALUE based on result diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index dea9aa6d97ed7..fc7d909ca0dda 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced pname = "netpbm"; - version = "10.92.0"; + version = "10.96.2"; outputs = [ "bin" "out" "dev" ]; src = fetchsvn { url = "https://svn.code.sf.net/p/netpbm/code/advanced"; - rev = "3972"; - sha256 = "09fpy4n4f867j23pr3b719wpvp8hjrr4drxp0r1csw74p8j6vfy3"; + rev = "4158"; + sha256 = "NK8GXCvCEnbQJWvVngB5UMOVmfsiyU4Fq0JIY9UNSjo="; }; nativeBuildInputs = [ |