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

Merge pull request #114231 from Mic92/glib

This commit is contained in:
Jörg Thalheim 2021-02-24 18:32:49 +00:00 committed by GitHub
parent ea301fc230 74e0aaaa30
commit dca9fa5ede
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/glib/default.nix
View File

@ -92,6 +92,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
libelf setupHook pcre libelf setupHook pcre
bash gnum4 # install glib-gettextize and m4 macros for other apps to use bash gnum4 # install glib-gettextize and m4 macros for other apps to use
gtk-doc
] ++ optionals stdenv.isLinux [ ] ++ optionals stdenv.isLinux [
libselinux libselinux
util-linuxMinimal # for libmount util-linuxMinimal # for libmount
@ -99,8 +100,10 @@ stdenv.mkDerivation rec {
AppKit Carbon Cocoa CoreFoundation CoreServices Foundation AppKit Carbon Cocoa CoreFoundation CoreServices Foundation
]); ]);
strictDeps = true;
nativeBuildInputs = [ nativeBuildInputs = [
meson ninja pkg-config perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45 meson ninja pkg-config perl python3 gettext gtk-doc docbook_xsl docbook_xml_dtd_45 libxml2
]; ];
propagatedBuildInputs = [ zlib libffi gettext libiconv ]; propagatedBuildInputs = [ zlib libffi gettext libiconv ];
@ -120,6 +123,8 @@ stdenv.mkDerivation rec {
"-DG_DISABLE_CAST_CHECKS" "-DG_DISABLE_CAST_CHECKS"
]; ];
hardeningDisable = [ "pie" ];
postPatch = '' postPatch = ''
chmod +x gio/tests/gengiotypefuncs.py chmod +x gio/tests/gengiotypefuncs.py
patchShebangs gio/tests/gengiotypefuncs.py patchShebangs gio/tests/gengiotypefuncs.py
@ -144,7 +149,7 @@ stdenv.mkDerivation rec {
cp -r ${buildPackages.glib.devdoc} $devdoc cp -r ${buildPackages.glib.devdoc} $devdoc
''; '';
checkInputs = [ tzdata libxml2 desktop-file-utils shared-mime-info ]; checkInputs = [ tzdata desktop-file-utils shared-mime-info ];
preCheck = optionalString doCheck '' preCheck = optionalString doCheck ''
export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${pname}-${version}/glib/.libs''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${pname}-${version}/glib/.libs''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"