diff options
| author | Vladimír Čunát <v@cunat.cz> | 2021-06-11 06:53:41 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2021-06-11 06:53:41 +0200 |
| commit | c41788d925c2ee5a444691863f3cf74a84a91ba2 (patch) | |
| tree | 4a5460b2cc123674ae56bd24bffb2d5ae77206c8 /pkgs/development/libraries/gnutls | |
| parent | 5945d9c4846ea138e26c8da8b525d65bbe820af5 (diff) | |
| download | nixpkgs-c41788d925c2ee5a444691863f3cf74a84a91ba2.tar nixpkgs-c41788d925c2ee5a444691863f3cf74a84a91ba2.tar.gz nixpkgs-c41788d925c2ee5a444691863f3cf74a84a91ba2.tar.bz2 nixpkgs-c41788d925c2ee5a444691863f3cf74a84a91ba2.tar.lz nixpkgs-c41788d925c2ee5a444691863f3cf74a84a91ba2.tar.xz nixpkgs-c41788d925c2ee5a444691863f3cf74a84a91ba2.tar.zst nixpkgs-c41788d925c2ee5a444691863f3cf74a84a91ba2.zip | |
gnutls: simplify expression (pname + version)
We haven't supported multiple versions for a long time.
Diffstat (limited to 'pkgs/development/libraries/gnutls')
| -rw-r--r-- | pkgs/development/libraries/gnutls/default.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 0d2fd064263..caca028782d 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -8,19 +8,18 @@ assert guileBindings -> guile != null; let - version = "3.7.2"; # XXX: Gnulib's `test-select' fails on FreeBSD: # https://hydra.nixos.org/build/2962084/nixlog/1/raw . - doCheck = !stdenv.isFreeBSD && !stdenv.isDarwin && lib.versionAtLeast version "3.4" + doCheck = !stdenv.isFreeBSD && !stdenv.isDarwin && stdenv.buildPlatform == stdenv.hostPlatform; inherit (stdenv.hostPlatform) isDarwin; in -stdenv.mkDerivation { - name = "gnutls-${version}"; - inherit version; +stdenv.mkDerivation rec { + pname = "gnutls"; + version = "3.7.2"; src = fetchurl { url = "mirror://gnupg/gnutls/v3.7/gnutls-${version}.tar.xz"; @@ -42,7 +41,7 @@ stdenv.mkDerivation { # - trust-store: default trust store path (/etc/ssl/...) is missing in sandbox (3.5.11) # - psk-file: no idea; it broke between 3.6.3 and 3.6.4 # Change p11-kit test to use pkg-config to find p11-kit - postPatch = lib.optionalString (lib.versionAtLeast version "3.6") '' + postPatch = '' sed '2iexit 77' -i tests/{pkgconfig,fastopen}.sh sed '/^void doit(void)/,/^{/ s/{/{ exit(77);/' -i tests/{trust-store,psk-file}.c sed 's:/usr/lib64/pkcs11/ /usr/lib/pkcs11/ /usr/lib/x86_64-linux-gnu/pkcs11/:`pkg-config --variable=p11_module_path p11-kit-1`:' -i tests/p11-kit-trust.sh |