diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:31:50 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:32:25 +0100 |
commit | b7baf40e099b4215181fe7b0c63083b12ef2c7fb (patch) | |
tree | a6efabd31d05b6d0a36624729e80377bbbfb0149 /nixpkgs/pkgs/development/tools/glamoroustoolkit/default.nix | |
parent | 710028664e26e85cb831a869b3da9f6993902255 (diff) | |
parent | 0799f514b1cd74878174939df79ac60ca5036673 (diff) | |
download | nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.gz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.bz2 nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.lz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.xz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.zst nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/tools/glamoroustoolkit/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/tools/glamoroustoolkit/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/tools/glamoroustoolkit/default.nix b/nixpkgs/pkgs/development/tools/glamoroustoolkit/default.nix index f861ef74e0ce..3a32bfdaddaa 100644 --- a/nixpkgs/pkgs/development/tools/glamoroustoolkit/default.nix +++ b/nixpkgs/pkgs/development/tools/glamoroustoolkit/default.nix @@ -14,6 +14,7 @@ , libXi , libXrandr , libXrender +, libgit2 , libglvnd , libuuid , libxcb @@ -21,12 +22,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "glamoroustoolkit"; - version = "1.0.10"; + version = "1.0.11"; 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-TvT1u9eVHEg/NomTVlY8gFAYxj76ZLRLm3kbtXUTyc8="; + hash = "sha256-GQeYR232zoHLIt1AzznD7rp6u4zMiAdj1+0OfXfT6AQ="; }; nativeBuildInputs = [ wrapGAppsHook ]; @@ -91,7 +92,8 @@ preFixup = let ln -s $out/lib/libcrypto.so $out/lib/libcrypto.so.1.1 ln -s $out/lib/libcairo.so $out/lib/libcairo.so.2 - ln -s $out/lib/libgit2.so $out/lib/libgit2.so.1.1 + rm $out/lib/libgit2.so + ln -s "${libgit2}/lib/libgit2.so" $out/lib/libgit2.so.1.1 ''; meta = { |