Skip to content

Commit

Permalink
glamoroustoolkit: 1.0.11 -> 1.0.42
Browse files Browse the repository at this point in the history
Changes:

- Work around an issue with patchelf 0.12 and later by using patchelf
  0.11 (see NixOS/patchelf#546)
- Set "dontStrip = true" as patchelf 0.11 corrupts libWinit.so
- Add dependencies for new library libWebView
- Add zenity to $PATH (used for GlamorousToolkit file open dialog)
  • Loading branch information
akgrant43 committed Sep 5, 2024
1 parent 13c7cdc commit 253223e
Showing 1 changed file with 29 additions and 3 deletions.
32 changes: 29 additions & 3 deletions pkgs/development/tools/glamoroustoolkit/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{ lib
, pkgs
, stdenv
, fetchzip
, fetchurl
, patchelf
, wrapGAppsHook3
, cairo
, dbus
Expand All @@ -18,25 +21,38 @@
, libglvnd
, libuuid
, libxcb
, harfbuzz # libWebView.so
, libsoup_3 # libWebView.so
, webkitgtk_4_1 # libWebView.so
}:

stdenv.mkDerivation (finalAttrs: {
pname = "glamoroustoolkit";
version = "1.0.11";
version = "1.0.42";

src = fetchzip {
url = "https://github.com/feenkcom/gtoolkit-vm/releases/download/v${finalAttrs.version}/GlamorousToolkit-x86_64-unknown-linux-gnu.zip";
stripRoot = false;
hash = "sha256-GQeYR232zoHLIt1AzznD7rp6u4zMiAdj1+0OfXfT6AQ=";
hash = "sha256-CwWJ5hntnfE9/xBNlV5yCp/Ndd0xj7rQHVopwKLAgSU=";
};

nativeBuildInputs = [ wrapGAppsHook3 ];
nativeBuildInputs = [
wrapGAppsHook3
(patchelf.overrideAttrs (old: {
version = "0.11";
src = fetchurl {
url = "https://nixos.org/releases/patchelf/patchelf-0.11/patchelf-0.11.tar.bz2";
sha256 = "16ms3ijcihb88j3x6cl8cbvhia72afmfcphczb9cfwr0gbc22chx";
};
}))
];

sourceRoot = ".";

dontConfigure = true;
dontBuild = true;
dontPatchELF = true;
dontStrip = true;

installPhase = ''
runHook preInstall
Expand Down Expand Up @@ -65,8 +81,14 @@ preFixup = let
libglvnd
libuuid
libxcb
harfbuzz
libsoup_3
webkitgtk_4_1
stdenv.cc.cc.lib
];
binPath = lib.makeBinPath [
pkgs.gnome.zenity # File selection dialog
];
in ''
chmod +x $out/lib/*.so
patchelf \
Expand Down Expand Up @@ -94,6 +116,10 @@ preFixup = let
ln -s $out/lib/libcairo.so $out/lib/libcairo.so.2
rm $out/lib/libgit2.so
ln -s "${libgit2}/lib/libgit2.so" $out/lib/libgit2.so.1.1
gappsWrapperArgs+=(
--prefix PATH : ${binPath}
)
'';

meta = {
Expand Down

0 comments on commit 253223e

Please sign in to comment.