diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-06-22 15:01:47 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-06-22 16:57:59 +0000 |
commit | 633cab0ecb07627706c6b523e219490f019eaab5 (patch) | |
tree | 4fb472bdfe2723037dad53dc1b8a87c939015f5e /nixpkgs/pkgs/development/libraries/libimobiledevice | |
parent | ffb691c199e7e0cbc4e45e5310779c9e3f7c2a73 (diff) | |
parent | 432fc2d9a67f92e05438dff5fdc2b39d33f77997 (diff) | |
download | nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.gz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.bz2 nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.lz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.xz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.zst nixlib-633cab0ecb07627706c6b523e219490f019eaab5.zip |
Merge commit '432fc2d9a67f92e05438dff5fdc2b39d33f77997'
# Conflicts: # nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix # nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix # nixpkgs/pkgs/applications/window-managers/sway/default.nix # nixpkgs/pkgs/build-support/rust/default.nix # nixpkgs/pkgs/development/go-modules/generic/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libimobiledevice')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libimobiledevice/default.nix | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libimobiledevice/default.nix b/nixpkgs/pkgs/development/libraries/libimobiledevice/default.nix index b805be1257bd..94fce176127c 100644 --- a/nixpkgs/pkgs/development/libraries/libimobiledevice/default.nix +++ b/nixpkgs/pkgs/development/libraries/libimobiledevice/default.nix @@ -1,25 +1,36 @@ -{ lib, stdenv, fetchFromGitHub, automake, autoconf, libtool, pkg-config, gnutls -, libgcrypt, libtasn1, glib, libplist, libusbmuxd }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, libtool +, pkg-config +, gnutls +, libgcrypt +, libtasn1 +, glib +, libplist +, libusbmuxd +}: stdenv.mkDerivation rec { pname = "libimobiledevice"; - version = "1.3.0"; + version = "unstable-2021-06-02"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = version; - sha256 = "1jkq3hpg4n5a6s1k618ib0s80pwf00nlfcby7xckysq8mnd2pp39"; + rev = "ca324155f8b33babf907704828c7903608db0aa2"; + sha256 = "sha256-Q7THwld1+elMJQ14kRnlIJDohFt7MW7JeyIUGC0k52I="; }; outputs = [ "out" "dev" ]; nativeBuildInputs = [ - autoconf - automake + autoreconfHook libtool pkg-config ]; + propagatedBuildInputs = [ glib gnutls @@ -29,12 +40,7 @@ stdenv.mkDerivation rec { libusbmuxd ]; - preConfigure = "NOCONFIGURE=1 ./autogen.sh"; - - configureFlags = [ - "--disable-openssl" - "--without-cython" - ]; + configureFlags = [ "--disable-openssl" "--without-cython" ]; meta = with lib; { homepage = "https://github.com/libimobiledevice/libimobiledevice"; |