diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-08-23 10:09:14 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-08-26 09:07:03 +0000 |
| commit | 63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f (patch) | |
| tree | d58934cb48f9c953b19a0d0d5cffc0d0c5561471 /nixpkgs/pkgs/development/libraries/libagar | |
| parent | c4eef3dacb2a3d359561f30917d9e3cc4e041be9 (diff) | |
| parent | 91a22f76cd1716f9d0149e8a5c68424bb691de15 (diff) | |
| download | nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.gz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.bz2 nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.lz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.xz nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.tar.zst nixlib-63dabcc77ef9a56655e1ca2ab2e25e6163a72c1f.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libagar')
3 files changed, 10 insertions, 17 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libagar/default.nix b/nixpkgs/pkgs/development/libraries/libagar/default.nix index 28d5e481324a..bff80ab996db 100644 --- a/nixpkgs/pkgs/development/libraries/libagar/default.nix +++ b/nixpkgs/pkgs/development/libraries/libagar/default.nix @@ -3,10 +3,14 @@ , libsndfile, portaudio, libmysqlclient, fontconfig }: -let srcs = import ./srcs.nix { inherit fetchurl; }; in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "libagar"; - inherit (srcs) version src; + version = "1.5.0"; + + src = fetchurl { + url = "http://stable.hypertriton.com/agar/agar-${finalAttrs.version}.tar.gz"; + sha256 = "001wcqk5z67qg0raw9zlwmv62drxiwqykvsbk10q2mrc6knjsd42"; + }; preConfigure = '' substituteInPlace configure.in \ @@ -40,4 +44,4 @@ stdenv.mkDerivation { maintainers = with maintainers; [ ramkromberg ]; platforms = with platforms; linux; }; -} +}) diff --git a/nixpkgs/pkgs/development/libraries/libagar/libagar_test.nix b/nixpkgs/pkgs/development/libraries/libagar/libagar_test.nix index 96574ca11887..c54a7957f436 100644 --- a/nixpkgs/pkgs/development/libraries/libagar/libagar_test.nix +++ b/nixpkgs/pkgs/development/libraries/libagar/libagar_test.nix @@ -1,11 +1,10 @@ { lib, stdenv, fetchurl, bsdbuild, libagar, perl, libjpeg, libpng, openssl }: -let srcs = import ./srcs.nix { inherit fetchurl; }; in stdenv.mkDerivation { pname = "libagar-test"; - inherit (srcs) version src; + inherit (libagar) version src; - sourceRoot = "agar-1.5.0/tests"; + sourceRoot = "agar-${libagar.version}/tests"; # Workaround build failure on -fno-common toolchains: # ld: textdlg.o:(.bss+0x0): multiple definition of `someString'; diff --git a/nixpkgs/pkgs/development/libraries/libagar/srcs.nix b/nixpkgs/pkgs/development/libraries/libagar/srcs.nix deleted file mode 100644 index 53c6a5b89dad..000000000000 --- a/nixpkgs/pkgs/development/libraries/libagar/srcs.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ fetchurl }: -rec { - version = "1.5.0"; - - src = fetchurl { - url = "http://stable.hypertriton.com/agar/agar-${version}.tar.gz"; - sha256 = "001wcqk5z67qg0raw9zlwmv62drxiwqykvsbk10q2mrc6knjsd42"; - }; - -} |