diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-11-03 13:31:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-03 13:31:58 +0100 |
| commit | f3bc4373dcf441c05f4b4761d33feb83255bf6e2 (patch) | |
| tree | 880eea72d4cec26915233b4ce46d16356e43d678 /pkgs/development | |
| parent | 01f6d4d36f4eda1d8137cd4e996a3d635bd28801 (diff) | |
| parent | 0caf36def09e3ad7785a66eff268e623b06b816a (diff) | |
| download | nixpkgs-f3bc4373dcf441c05f4b4761d33feb83255bf6e2.tar nixpkgs-f3bc4373dcf441c05f4b4761d33feb83255bf6e2.tar.gz nixpkgs-f3bc4373dcf441c05f4b4761d33feb83255bf6e2.tar.bz2 nixpkgs-f3bc4373dcf441c05f4b4761d33feb83255bf6e2.tar.lz nixpkgs-f3bc4373dcf441c05f4b4761d33feb83255bf6e2.tar.xz nixpkgs-f3bc4373dcf441c05f4b4761d33feb83255bf6e2.tar.zst nixpkgs-f3bc4373dcf441c05f4b4761d33feb83255bf6e2.zip | |
Merge pull request #72224 from NixOS/staging-next
Staging next
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/glib/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/gtk/3.x.nix | 11 | ||||
| -rw-r--r-- | pkgs/development/libraries/libgdiplus/default.nix | 6 |
3 files changed, 16 insertions, 3 deletions
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 7c7d0aca75c..68bc169bb89 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -188,6 +188,8 @@ stdenv.mkDerivation rec { inherit doCheck; + separateDebugInfo = stdenv.isLinux; + passthru = rec { gioModuleDir = "lib/gio/modules"; makeSchemaPath = dir: name: "${dir}/share/gsettings-schemas/${name}/glib-2.0/schemas"; diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 15c3ab2daf8..7f09b52d51f 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -3,6 +3,9 @@ , fetchpatch , pkgconfig , gettext +, docbook_xsl +, docbook_xml_dtd_43 +, gtk-doc , meson , ninja , python3 @@ -33,6 +36,7 @@ , wayland-protocols , xineramaSupport ? stdenv.isLinux , cupsSupport ? stdenv.isLinux +, withGtkDoc ? stdenv.isLinux , cups ? null , AppKit , Cocoa @@ -46,7 +50,7 @@ stdenv.mkDerivation rec { pname = "gtk+3"; version = "3.24.12"; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" ] ++ optional withGtkDoc "devdoc"; outputBin = "dev"; setupHooks = [ @@ -78,6 +82,7 @@ stdenv.mkDerivation rec { separateDebugInfo = stdenv.isLinux; mesonFlags = [ + "-Dgtk_doc=${boolToString withGtkDoc}" "-Dtests=false" ]; @@ -114,6 +119,10 @@ stdenv.mkDerivation rec { python3 sassc setupHooks + ] ++ optionals withGtkDoc [ + docbook_xml_dtd_43 + docbook_xsl + gtk-doc ]; buildInputs = [ diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix index cdaf972911d..1a690ca7aa1 100644 --- a/pkgs/development/libraries/libgdiplus/default.nix +++ b/pkgs/development/libraries/libgdiplus/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libgdiplus"; - version = "6.0.2"; + version = "6.0.4"; src = fetchFromGitHub { owner = "mono"; repo = "libgdiplus"; rev = version; - sha256 = "07a3n7i35mn5j2djah64by785b1hzy8ckk1pz0xwvk716yzb7sxg"; + sha256 = "1pf3yhwq9qk0w3yv9bb8qlwwqkffg7xb4sgc8yqdnn6pa56i3vmn"; }; NIX_LDFLAGS = "-lgif"; @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; + configureFlags = stdenv.lib.optionalString stdenv.cc.isClang "--host=${stdenv.hostPlatform.system}"; + buildInputs = [ glib cairo fontconfig libtiff giflib libjpeg libpng libXrender libexif |