diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-02-13 12:25:07 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-02-13 12:25:07 +0100 |
| commit | a5e1520e4538e29ecfbd4b168306f890566d7bfd (patch) | |
| tree | 28099c268b5d4b1e33c2b29f0714c45f0b961382 /nixpkgs/pkgs/development/libraries/kdsoap | |
| parent | 822f7c15c04567fbdc27020e862ea2b70cfbf8eb (diff) | |
| parent | 3560d1c8269d0091b9aae10731b5e85274b7bbc1 (diff) | |
| download | nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar.gz nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar.bz2 nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar.lz nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar.xz nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.tar.zst nixlib-a5e1520e4538e29ecfbd4b168306f890566d7bfd.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/pkgs/build-support/go/module.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/kdsoap')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/kdsoap/default.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/development/libraries/kdsoap/default.nix b/nixpkgs/pkgs/development/libraries/kdsoap/default.nix index c2f94b8e6927..5dc6b5f962e1 100644 --- a/nixpkgs/pkgs/development/libraries/kdsoap/default.nix +++ b/nixpkgs/pkgs/development/libraries/kdsoap/default.nix @@ -11,11 +11,11 @@ let cmakeName = if isQt6 then "KDSoap-qt6" else "KDSoap"; in stdenv.mkDerivation rec { pname = "kdsoap"; - version = "2.1.1"; + version = "2.2.0"; src = fetchurl { url = "https://github.com/KDAB/KDSoap/releases/download/kdsoap-${version}/kdsoap-${version}.tar.gz"; - sha256 = "sha256-rtV/ayAN33YvXSiY9+kijdBwCIHESRrv5ABvf6X1xic="; + sha256 = "sha256-2e8RlIRCGXyfpEvW+63IQrcoCmDfxAV3r2b97WN681Y="; }; outputs = [ "out" "dev" ]; @@ -28,10 +28,8 @@ in stdenv.mkDerivation rec { postInstall = '' moveToOutput bin/kdwsdl2cpp* "$dev" - sed -i "$out/lib/cmake/${cmakeName}/KDSoapTargets.cmake" \ - -e "/^ INTERFACE_INCLUDE_DIRECTORIES/ c INTERFACE_INCLUDE_DIRECTORIES \"$dev/include\"" - sed -i "$out/lib/cmake/${cmakeName}/KDSoapTargets-release.cmake" \ - -e "s@$out/bin@$dev/bin@" + substituteInPlace "$out/lib/cmake/${cmakeName}/KDSoapTargets-release.cmake" \ + --replace $out/bin $dev/bin ''; meta = with lib; { |