From a9428864ddd355f2981596a5a9c773f29f345078 Mon Sep 17 00:00:00 2001 From: Artturi Date: Mon, 14 Aug 2023 09:30:38 +0300 Subject: [PATCH] Revert "gtk2,gtk3: rename derivation name" It broke using `gtk3.name` in `--prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/"` --- pkgs/development/libraries/gtk/2.x.nix | 2 +- pkgs/development/libraries/gtk/3.x.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix index 015d998b3d7..539cfc37051 100644 --- a/pkgs/development/libraries/gtk/2.x.nix +++ b/pkgs/development/libraries/gtk/2.x.nix @@ -37,7 +37,7 @@ let }; in stdenv.mkDerivation (finalAttrs: { - pname = "gtk2"; + pname = "gtk+"; version = "2.24.33"; src = fetchurl { diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index dc664a961c4..a527faf5a8b 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -62,7 +62,7 @@ let in stdenv.mkDerivation (finalAttrs: { - pname = "gtk3"; + pname = "gtk+3"; version = "3.24.38"; outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc";