diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-09-29 16:00:31 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-10-09 21:35:51 +0200 |
| commit | c1d711afc59ac4c5cbc8fe9d5d535b6e754d0e81 (patch) | |
| tree | 755a2e9568cee26baa55f2aae9ed88c6f2c0ca7f /pkgs/development/libraries/libsoup/default.nix | |
| parent | feff9a8069ddf56adceb2a1698025cf775de4efd (diff) | |
| download | nixpkgs-c1d711afc59ac4c5cbc8fe9d5d535b6e754d0e81.tar nixpkgs-c1d711afc59ac4c5cbc8fe9d5d535b6e754d0e81.tar.gz nixpkgs-c1d711afc59ac4c5cbc8fe9d5d535b6e754d0e81.tar.bz2 nixpkgs-c1d711afc59ac4c5cbc8fe9d5d535b6e754d0e81.tar.lz nixpkgs-c1d711afc59ac4c5cbc8fe9d5d535b6e754d0e81.tar.xz nixpkgs-c1d711afc59ac4c5cbc8fe9d5d535b6e754d0e81.tar.zst nixpkgs-c1d711afc59ac4c5cbc8fe9d5d535b6e754d0e81.zip | |
libsoup: clean up
To keep in sync with libsoup3.
Diffstat (limited to 'pkgs/development/libraries/libsoup/default.nix')
| -rw-r--r-- | pkgs/development/libraries/libsoup/default.nix | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 0bbfa5017d1..6d2150103a1 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -24,16 +24,23 @@ stdenv.mkDerivation rec { pname = "libsoup"; version = "2.74.0"; + outputs = [ "out" "dev" ]; + src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "sha256-M7HU4NY5RWxnXCJ4d+lKgHjXMSM+LVdonBGrzvfTxI4="; }; - postPatch = '' - patchShebangs libsoup/ - ''; - - outputs = [ "out" "dev" ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + glib + ] ++ lib.optionals withIntrospection [ + gobject-introspection + ] ++ lib.optionals withVala [ + vala + ]; buildInputs = [ python3 @@ -44,12 +51,11 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isLinux [ libsysprof-capture ]; - nativeBuildInputs = [ meson ninja pkg-config glib ] - ++ lib.optional withIntrospection gobject-introspection - ++ lib.optional withVala vala; - propagatedBuildInputs = [ glib libxml2 ]; - NIX_CFLAGS_COMPILE = [ "-lpthread" ]; + propagatedBuildInputs = [ + glib + libxml2 + ]; mesonFlags = [ "-Dtls_check=false" # glib-networking is a runtime dependency, not a compile-time dependency |