From c24a1a2fc72e260184ab08cb9902664a94f14b99 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 9 Jun 2023 20:28:00 -0300 Subject: [PATCH] rep-gtk: refactor Now with strictDeps and gtk-x11! --- .../development/libraries/rep-gtk/default.nix | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/rep-gtk/default.nix b/pkgs/development/libraries/rep-gtk/default.nix index 433da05d088..4d8cfc0a769 100644 --- a/pkgs/development/libraries/rep-gtk/default.nix +++ b/pkgs/development/libraries/rep-gtk/default.nix @@ -2,39 +2,43 @@ , stdenv , fetchurl , autoreconfHook -, gtk2 +, gtk2-x11 , librep , pkg-config }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rep-gtk"; version = "0.90.8.3"; src = fetchurl { - url = "https://download.tuxfamily.org/librep/${pname}/${pname}_${version}.tar.xz"; - sha256 = "0hgkkywm8zczir3lqr727bn7ybgg71x9cwj1av8fykkr8pdpard9"; + url = "https://download.tuxfamily.org/librep/rep-gtk/rep-gtk_${finalAttrs.version}.tar.xz"; + hash = "sha256-qWV120V5Tu/QVkFylno47y1/7DriZExHjp99VLmf80E="; }; nativeBuildInputs = [ autoreconfHook pkg-config - ]; - buildInputs = [ - gtk2 librep ]; + buildInputs = [ + gtk2-x11 + librep + ]; + + strictDeps = true; + patchPhase = '' sed -e 's|installdir=$(repexecdir)|installdir=$(libdir)/rep|g' -i Makefile.in ''; - meta = with lib; { + meta = { homepage = "http://sawfish.tuxfamily.org"; description = "GTK bindings for librep"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.unix; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.AndersonTorres ]; + platforms = lib.platforms.unix; }; -} +}) # TODO: investigate fetchFromGithub