File tree Expand file tree Collapse file tree 2 files changed +21
-39
lines changed
pkgs/by-name/xd/xdg-user-dirs Expand file tree Collapse file tree 2 files changed +21
-39
lines changed Load Diff This file was deleted.
Original file line number Diff line number Diff line change 11{
22 lib ,
33 stdenv ,
4- autoreconfHook ,
4+ meson ,
5+ ninja ,
56 fetchurl ,
67 libxslt ,
78 docbook_xsl ,
89 docbook_xml_dtd_43 ,
910 gettext ,
10- makeWrapper ,
11+ makeBinaryWrapper ,
12+ libiconv ,
13+ libintl ,
1114} :
1215
1316stdenv . mkDerivation ( finalAttrs : {
1417 pname = "xdg-user-dirs" ;
15- version = "0.18 " ;
18+ version = "0.19 " ;
1619
1720 src = fetchurl {
18- url = "https://user-dirs.freedesktop.org/releases/xdg-user-dirs-${ finalAttrs . version } .tar.gz " ;
19- hash = "sha256-7G8G10lc26N6cyA5+bXhV4vLKWV2/eDaQO2y9SIg3zw =" ;
21+ url = "https://user-dirs.freedesktop.org/releases/xdg-user-dirs-${ finalAttrs . version } .tar.xz " ;
22+ hash = "sha256-6S3rkpwQ1LKTKTl6+KJYUQEkf35hd6xvHSjoITDtjBk =" ;
2023 } ;
2124
22- patches = [
23- # https://gitlab.freedesktop.org/xdg/xdg-user-dirs/-/merge_requests/16
24- ./gettext-0.25.patch
25- ] ;
26-
27- postPatch = ''
28- substituteInPlace Makefile.am \
29- --replace-fail 'libraries = $(LIBINTL)' 'libraries = $(LIBICONV) $(LIBINTL)'
30- '' ;
31-
3225 nativeBuildInputs = [
33- autoreconfHook
34- makeWrapper
26+ meson
27+ ninja
28+ makeBinaryWrapper
3529 libxslt
3630 docbook_xsl
3731 docbook_xml_dtd_43
38- ]
39- ++ lib . optionals stdenv . hostPlatform . isDarwin [ gettext ] ;
32+ gettext
33+ ] ;
34+
35+ buildInputs = [
36+ libiconv
37+ libintl
38+ ] ;
4039
4140 NIX_LDFLAGS = if stdenv . isDarwin then "-liconv" else null ;
4241
4342 preFixup = ''
4443 # fallback values need to be last
4544 wrapProgram "$out/bin/xdg-user-dirs-update" \
4645 --suffix XDG_CONFIG_DIRS : "$out/etc/xdg"
46+
47+ substituteInPlace "$out/lib/systemd/user/xdg-user-dirs.service" \
48+ --replace-fail "/usr/bin/xdg-user-dirs-update" "$out/bin/xdg-user-dirs-update"
4749 '' ;
4850
4951 meta = {
You can’t perform that action at this time.
0 commit comments