public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gobject-introspection: more clean-ups

Browse Source 
* 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
This commit is contained in:
Jan Tojnar 2020-05-15 19:55:13 +02:00
parent 1bc7b68b1c
commit fbb86b1fa8
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/libraries/gobject-introspection/default.nix
View File

@ -8,11 +8,9 @@
, pkg-config , pkg-config
, libffi , libffi
, python3 , python3
, libintl
, cctools , cctools
, cairo , cairo
, gnome3 , gnome3
, glibcLocales
, substituteAll , substituteAll
, nixStoreDir ? builtins.storeDir , nixStoreDir ? builtins.storeDir
, x11Support ? true , x11Support ? true
@ -58,8 +56,6 @@ stdenv.mkDerivation rec {
meson meson
ninja ninja
pkg-config pkg-config
libintl
glibcLocales
]; ];
buildInputs = [ buildInputs = [
@ -84,9 +80,7 @@ stdenv.mkDerivation rec {
doCheck = !stdenv.isAarch64; doCheck = !stdenv.isAarch64;
LC_ALL = "en_US.UTF-8"; # for tests preCheck = ''
preBuild = ''
# Our gobject-introspection patches make the shared library paths absolute # Our gobject-introspection patches make the shared library paths absolute
# in the GIR files. When running tests, the library is not yet installed, # 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. # 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} 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} rm $out/lib/libregress-1.0${stdenv.targetPlatform.extensions.sharedLibrary}
''; '';
@ -109,8 +103,8 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A middleware layer between C libraries and language bindings"; description = "A middleware layer between C libraries and language bindings";
homepage = "http://live.gnome.org/GObjectIntrospection"; homepage = "https://gi.readthedocs.io/";
maintainers = with maintainers; [ lovek323 lethalman ]; maintainers = teams.gnome.members ++ (with maintainers; [ lovek323 ]);
platforms = platforms.unix; platforms = platforms.unix;
license = with licenses; [ gpl2 lgpl2 ]; license = with licenses; [ gpl2 lgpl2 ];