diff options
author | Jonas Heinrich <onny@project-insanity.org> | 2023-01-25 11:10:31 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-25 11:10:31 +0100 |
commit | 9b97ad7b4330aacda9b2343396eb3df8a853b4fc (patch) | |
tree | cb388dc7c1f395eabdb4e7ef7b78ce7be127cc6d | |
parent | cd1351bd030cb7d4c0d680a6006d156161995afc (diff) | |
parent | 6803ef067fe6b669d9c6db0ca017cec6ec344be7 (diff) |
Merge pull request #212213 from shashurup/lazpaint-7.2.2
lazpaint: 7.1.5 -> 7.2.2
-rw-r--r-- | pkgs/applications/graphics/lazpaint/default.nix | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/pkgs/applications/graphics/lazpaint/default.nix b/pkgs/applications/graphics/lazpaint/default.nix index 37ad3387f834..91562bb5d49e 100644 --- a/pkgs/applications/graphics/lazpaint/default.nix +++ b/pkgs/applications/graphics/lazpaint/default.nix @@ -7,24 +7,24 @@ let bgrabitmap = fetchFromGitHub { owner = "bgrabitmap"; repo = "bgrabitmap"; - rev = "v11.2.5"; - sha256 = "0w5pdihsxn039kalkf4cx23j69hz5r09qmhd358h2n74irv1r3x1"; + rev = "v11.5.3"; + sha256 = "sha256-qjBD9TVZQy1tKWHFWkuu6vdLjASzQb3+HRy0FLdd9a8="; }; bgracontrols = fetchFromGitHub { owner = "bgrabitmap"; repo = "bgracontrols"; - rev = "v7.0"; - sha256 = "0qz3cscrc9jvhrix1hbmzhdxv6mxk0mz9azr46canflsydda8fjy"; + rev = "v7.6"; + sha256 = "sha256-btg9DMdYg+C8h0H7MU+uoo2Kb4OeLHoxFYHAv7LbLBA="; }; in stdenv.mkDerivation rec { pname = "lazpaint"; - version = "7.1.5"; + version = "7.2.2"; src = fetchFromGitHub { owner = "bgrabitmap"; repo = "lazpaint"; rev = "v${version}"; - sha256 = "0bpk3rlqzbxvgrxmrzs0hcrgwhsqnpjqv1kdd9cp09knimmksvy5"; + sha256 = "sha256-J6s0GnGJ7twEYW5+B72bB3EX4AYvLnhSPLbdhZWzlkw="; }; nativeBuildInputs = [ lazarus fpc makeWrapper ]; @@ -33,6 +33,10 @@ in stdenv.mkDerivation rec { NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}"; + preConfigure = '' + patchShebangs configure + ''; + buildPhase = '' cp -r --no-preserve=mode ${bgrabitmap} bgrabitmap cp -r --no-preserve=mode ${bgracontrols} bgracontrols @@ -47,6 +51,7 @@ in stdenv.mkDerivation rec { installPhase = '' # Reuse existing install script + substituteInPlace Makefile --replace "/bin/bash" $BASH cd lazpaint/release/debian substituteInPlace makedeb.sh --replace "rm -rf" "ls" patchShebangs ./makedeb.sh @@ -64,6 +69,5 @@ in stdenv.mkDerivation rec { license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ ]; - broken = true; # 2022-11-16 }; } |