diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-08-08 16:04:42 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-08-13 06:35:37 +0000 |
| commit | 12aaa58dac35800b5b7d77f81cf2a87c21ee55da (patch) | |
| tree | be0add9e5c22a85d20b5d78206aa74f956eb2a1b /nixpkgs/pkgs/development/libraries/libimobiledevice | |
| parent | 45892a5591202f75a1c2f1ca7c62a92c7566e3c5 (diff) | |
| parent | 5a8e9243812ba528000995b294292d3b5e120947 (diff) | |
| download | nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.gz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.bz2 nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.lz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.xz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.zst nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix Link: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/391
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libimobiledevice')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libimobiledevice/default.nix | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libimobiledevice/default.nix b/nixpkgs/pkgs/development/libraries/libimobiledevice/default.nix index 8ded220678d0..000649100313 100644 --- a/nixpkgs/pkgs/development/libraries/libimobiledevice/default.nix +++ b/nixpkgs/pkgs/development/libraries/libimobiledevice/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , autoreconfHook , pkg-config -, gnutls +, openssl , libgcrypt , libplist , libtasn1 @@ -15,28 +15,24 @@ stdenv.mkDerivation rec { pname = "libimobiledevice"; - version = "1.3.0+date=2022-05-22"; + version = "1.3.0+date=2023-04-30"; outputs = [ "out" "dev" ]; src = fetchFromGitHub { owner = "libimobiledevice"; repo = pname; - rev = "12394bc7be588be83c352d7441102072a89dd193"; - hash = "sha256-2K4gZrFnE4hlGlthcKB4n210bTK3+6NY4TYVIoghXJM="; + rev = "860ffb707af3af94467d2ece4ad258dda957c6cd"; + hash = "sha256-mIsB+EaGJlGMOpz3OLrs0nAmhOY1BwMs83saFBaejwc="; }; - postPatch = '' - echo '${version}' > .tarball-version - ''; - nativeBuildInputs = [ autoreconfHook pkg-config ]; propagatedBuildInputs = [ - gnutls + openssl libgcrypt libplist libtasn1 @@ -47,7 +43,11 @@ stdenv.mkDerivation rec { CoreFoundation ]; - configureFlags = [ "--with-gnutls" "--without-cython" ]; + preAutoreconf = '' + export RELEASE_VERSION=${version} + ''; + + configureFlags = [ "--without-cython" ]; meta = with lib; { homepage = "https://github.com/libimobiledevice/libimobiledevice"; |