diff options
author | florian on nixos (Florian Brandes) <florian.brandes@posteo.de> | 2022-03-24 19:10:34 +0100 |
---|---|---|
committer | florian on nixos (Florian Brandes) <florian.brandes@posteo.de> | 2022-03-24 21:00:09 +0100 |
commit | 6c7720839b3b5c5866b0680d9aafe59567220ce8 (patch) | |
tree | 1969867a32fe97647221c7e745f3503b9ddedcfd /pkgs/applications/editors/pinegrow | |
parent | d625945bf0ce54d8a6f010c4da0416152273057a (diff) |
pinegrow: 6.4 -> 6.5
also switched to makeWrapper due to library issues Signed-off-by: florian on nixos (Florian Brandes) <florian.brandes@posteo.de>
Diffstat (limited to 'pkgs/applications/editors/pinegrow')
-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 3b694e4b15161..1f069024eb9e0 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; { |