diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
commit | 99fcaeccb89621dd492203ce1f2d551c06f228ed (patch) | |
tree | 41cb730ae07383004789779b0f6e11cb3f4642a3 /nixpkgs/pkgs/development/libraries/the-foundation | |
parent | 59c5f5ac8682acc13bb22bc29c7cf02f7d75f01f (diff) | |
parent | 75a5ebf473cd60148ba9aec0d219f72e5cf52519 (diff) | |
download | nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.gz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.bz2 nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.lz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.xz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.zst nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/config/console.nix nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix nixpkgs/pkgs/applications/networking/irc/weechat/default.nix 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/interpreters/python/default.nix nixpkgs/pkgs/development/node-packages/overrides.nix nixpkgs/pkgs/development/tools/b4/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix nixpkgs/pkgs/servers/mail/public-inbox/default.nix nixpkgs/pkgs/tools/security/pinentry/default.nix nixpkgs/pkgs/tools/text/unoconv/default.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/the-foundation')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/the-foundation/default.nix | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/libraries/the-foundation/default.nix b/nixpkgs/pkgs/development/libraries/the-foundation/default.nix index 012d13964c4b..69d88f508dac 100644 --- a/nixpkgs/pkgs/development/libraries/the-foundation/default.nix +++ b/nixpkgs/pkgs/development/libraries/the-foundation/default.nix @@ -10,22 +10,27 @@ , zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "the-foundation"; - version = "1.4.0"; + version = "1.6.1"; src = fetchFromGitea { domain = "git.skyjake.fi"; owner = "skyjake"; repo = "the_Foundation"; - rev = "v${version}"; - hash = "sha256-IHwWJryG4HcrW9Bf8KJrisCrbF86RBQj6Xl1HTmcr6k="; + rev = "v${finalAttrs.version}"; + hash = "sha256-GOvdnmutSQcsNT57tADLSkJAUX0JDVsualII+y21a+I="; }; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ curl libunistring openssl pcre zlib ]; + postFixup = '' + substituteInPlace "$out"/lib/pkgconfig/the_Foundation.pc \ + --replace '="''${prefix}//' '="/' + ''; + meta = with lib; { description = "Opinionated C11 library for low-level functionality"; homepage = "https://git.skyjake.fi/skyjake/the_Foundation"; @@ -33,4 +38,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; }; -} +}) |