summary refs log tree commit diff
path: root/pkgs/development/libraries/gobject-introspection
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2020-05-15 19:55:13 +0200
committerJan Tojnar <jtojnar@gmail.com>2020-05-15 21:03:20 +0200
commitfbb86b1fa81ae7f29c6775066f6ce089db5ff6d3 (patch)
treed50d8c8883c0cc31fe0f8382dd4134a14b40bb9f /pkgs/development/libraries/gobject-introspection
parent1bc7b68b1cac260d80cb33d52c86867a31f3d424 (diff)
gobject-introspection: more clean-ups
* remove glibcLocales now that glibc contains C.UTF-8
* remove libintl, that should be in by default or something
* update homepage
* add gnome team to maintainers
* remove the temporary libregress closer its creation
Diffstat (limited to 'pkgs/development/libraries/gobject-introspection')
-rw-r--r--pkgs/development/libraries/gobject-introspection/default.nix14
1 files changed, 4 insertions, 10 deletions
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index 1a92afc985919..7ff5498e5a959 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -8,11 +8,9 @@
 , pkg-config
 , libffi
 , python3
-, libintl
 , cctools
 , cairo
 , gnome3
-, glibcLocales
 , substituteAll
 , nixStoreDir ? builtins.storeDir
 , x11Support ? true
@@ -58,8 +56,6 @@ stdenv.mkDerivation rec {
     meson
     ninja
     pkg-config
-    libintl
-    glibcLocales
   ];
 
   buildInputs = [
@@ -84,9 +80,7 @@ stdenv.mkDerivation rec {
 
   doCheck = !stdenv.isAarch64;
 
-  LC_ALL = "en_US.UTF-8"; # for tests
-
-  preBuild = ''
+  preCheck = ''
     # Our gobject-introspection patches make the shared library paths absolute
     # in the GIR files. When running tests, the library is not yet installed,
     # though, so we need to replace the absolute path with a local one during build.
@@ -95,7 +89,7 @@ stdenv.mkDerivation rec {
     ln -s $PWD/tests/scanner/libregress-1.0${stdenv.targetPlatform.extensions.sharedLibrary} $out/lib/libregress-1.0${stdenv.targetPlatform.extensions.sharedLibrary}
   '';
 
-  preInstall = ''
+  postCheck = ''
     rm $out/lib/libregress-1.0${stdenv.targetPlatform.extensions.sharedLibrary}
   '';
 
@@ -109,8 +103,8 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A middleware layer between C libraries and language bindings";
-    homepage = "http://live.gnome.org/GObjectIntrospection";
-    maintainers = with maintainers; [ lovek323 lethalman ];
+    homepage = "https://gi.readthedocs.io/";
+    maintainers = teams.gnome.members ++ (with maintainers; [ lovek323 ]);
     platforms = platforms.unix;
     license = with licenses; [ gpl2 lgpl2 ];