diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-27 18:01:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-27 18:01:40 +0000 |
| commit | 36198fe1971a2fbf2977927cc822eadc0b473c21 (patch) | |
| tree | 8f9b7fd3904bf6abb17b1de7671b1ccfbf19bace /pkgs/applications/editors/pinegrow/default.nix | |
| parent | 512c8deb602e164f8ff1a7c793b6c7bf381a50b3 (diff) | |
| parent | e3d20dfaa59f5fde6b277943b7bc080390627bfa (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/editors/pinegrow/default.nix')
| -rw-r--r-- | pkgs/applications/editors/pinegrow/default.nix | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/applications/editors/pinegrow/default.nix b/pkgs/applications/editors/pinegrow/default.nix index 4f7967c3a34f1..4c93c4ae03628 100644 --- a/pkgs/applications/editors/pinegrow/default.nix +++ b/pkgs/applications/editors/pinegrow/default.nix @@ -8,22 +8,22 @@ , autoPatchelfHook , gsettings-desktop-schemas , gtk3 -, wrapGAppsHook +, makeWrapper }: stdenv.mkDerivation rec { pname = "pinegrow"; - version = "6.4"; + version = "6.5"; src = fetchurl { url = "https://download.pinegrow.com/PinegrowLinux64.${version}.zip"; - sha256 = "0i8sg4criimrqmz0g68b8xcwcrb362ssid5jazswpa6hhwj6s5n4"; + sha256 = "1l7cf5jgidpykaf68mzf92kywl1vxwl3fg43ibgr2rg4cnl1g82b"; }; nativeBuildInputs = [ unzip autoPatchelfHook - wrapGAppsHook + makeWrapper ]; buildInputs = [ @@ -34,6 +34,11 @@ stdenv.mkDerivation rec { gtk3 ]; + wrapProgramFlags = [ + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gcc-unwrapped.lib gtk3 udev ]}" + "--prefix PATH : ${lib.makeBinPath [ stdenv.cc ]}" + ]; + sourceRoot = "."; dontUnpack = true; @@ -57,7 +62,7 @@ stdenv.mkDerivation rec { preFixup = '' export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS - wrapGApp "$out/opt/pinegrow/PinegrowLibrary" --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]} + wrapProgram "$out/opt/pinegrow/PinegrowLibrary" ''${wrapProgramFlags[@]} ''; meta = with lib; { |