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/libxdg-basedir | |
| 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/libxdg-basedir')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libxdg-basedir/default.nix | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libxdg-basedir/default.nix b/nixpkgs/pkgs/development/libraries/libxdg-basedir/default.nix index 77047e9099d2..7786ec7908ff 100644 --- a/nixpkgs/pkgs/development/libraries/libxdg-basedir/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxdg-basedir/default.nix @@ -1,26 +1,29 @@ -{lib, stdenv, fetchurl, fetchpatch}: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +}: stdenv.mkDerivation rec { pname = "libxdg-basedir"; - version = "1.2.0"; + version = "1.2.3"; - src = fetchurl { - url = "https://nevill.ch/libxdg-basedir/downloads/libxdg-basedir-${version}.tar.gz"; - sha256 = "2757a949618742d80ac59ee2f0d946adc6e71576406cdf798e6ced507708cdf4"; + src = fetchFromGitHub { + owner = "devnev"; + repo = pname; + rev = "refs/tags/libxdg-basedir-${version}"; + hash = "sha256-ewtUKDdE6k9Q9hglWwhbTU3DTxvIN41t+zf2Gch9Dkk="; }; - patches = [ - # Overflow bug - (fetchpatch { - url = "https://github.com/devnev/libxdg-basedir/commit/14e000f696ef8b83264b0ca4407669bdb365fb23.patch"; - sha256 = "0lpy1ijir0x0hhb0fz0w5vxy1wl1cw9kkd6gva0rkp41i6vrp2wq"; - }) + nativeBuildInputs = [ + autoreconfHook ]; meta = with lib; { - homepage = "https://github.com/devnev/libxdg-basedir"; description = "Implementation of the XDG Base Directory specification"; + homepage = "https://github.com/devnev/libxdg-basedir"; license = licenses.mit; + maintainers = with maintainers; [ nickcao ]; platforms = platforms.unix; }; } |