libapplewm: refactor and migrate to pkgs/by-name from xorg.libAppleWM

Zitrone 7c2537d7 61b1d30e

+61 -49
+57
pkgs/by-name/li/libapplewm/package.nix
···
··· 1 + { 2 + lib, 3 + stdenv, 4 + fetchFromGitLab, 5 + pkg-config, 6 + autoreconfHook, 7 + util-macros, 8 + xorgproto, 9 + libX11, 10 + libXext, 11 + testers, 12 + }: 13 + stdenv.mkDerivation (finalAttrs: { 14 + pname = "libapplewm"; 15 + version = "1.4.1-unstable-2021-01-04"; 16 + 17 + src = fetchFromGitLab { 18 + domain = "gitlab.freedesktop.org"; 19 + owner = "xorg/lib"; 20 + repo = "libapplewm"; 21 + rev = "be972ebc3a97292e7d2b2350eff55ae12df99a42"; 22 + hash = "sha256-NH9YeOEtnEupqpnsMLC21I+LmCOzT7KnfdzNNWqba/Y="; 23 + }; 24 + 25 + strictDeps = true; 26 + 27 + nativeBuildInputs = [ 28 + pkg-config 29 + autoreconfHook 30 + util-macros 31 + ]; 32 + 33 + buildInputs = [ 34 + xorgproto 35 + libX11 36 + libXext 37 + ]; 38 + 39 + passthru = { 40 + # updateScript = # no updatescript since we don't use a tagged release (last one was 14 years ago) 41 + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 42 + }; 43 + 44 + meta = { 45 + description = "Xlib-based library for the Apple-WM extension"; 46 + longDescription = '' 47 + AppleWM is a simple library designed to interface with the Apple-WM extension. 48 + This extension allows X window managers to better interact with the Mac OS X Aqua user 49 + interface when running X11 in a rootless mode. 50 + ''; 51 + homepage = "https://gitlab.freedesktop.org/xorg/lib/libapplewm"; 52 + license = lib.licenses.mit; 53 + maintainers = [ ]; 54 + pkgConfigModules = [ "applewm" ]; 55 + platforms = lib.platforms.darwin; 56 + }; 57 + })
+2 -38
pkgs/servers/x11/xorg/default.nix
··· 7 gccmakedep, 8 ico, 9 imake, 10 libpciaccess, 11 libpthread-stubs, 12 libx11, ··· 52 ; 53 fontalias = font-alias; 54 fontutil = font-util; 55 libpthreadstubs = libpthread-stubs; 56 libX11 = libx11; 57 libXau = libxau; ··· 1694 passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 1695 meta = { 1696 pkgConfigModules = [ ]; 1697 - platforms = lib.platforms.unix; 1698 - }; 1699 - }) 1700 - ) { }; 1701 - 1702 - # THIS IS A GENERATED FILE. DO NOT EDIT! 1703 - libAppleWM = callPackage ( 1704 - { 1705 - stdenv, 1706 - pkg-config, 1707 - fetchurl, 1708 - xorgproto, 1709 - libX11, 1710 - libXext, 1711 - testers, 1712 - }: 1713 - stdenv.mkDerivation (finalAttrs: { 1714 - pname = "libAppleWM"; 1715 - version = "be972ebc3a97292e7d2b2350eff55ae12df99a42"; 1716 - builder = ./builder.sh; 1717 - src = fetchurl { 1718 - url = "https://gitlab.freedesktop.org/xorg/lib/libAppleWM/-/archive/be972ebc3a97292e7d2b2350eff55ae12df99a42/libAppleWM-be972ebc3a97292e7d2b2350eff55ae12df99a42.tar.bz2"; 1719 - sha256 = "1hrq03pahmrbb05r6a7j7m1nxl65wlfi6d2lwm1kvra63q91f9ph"; 1720 - }; 1721 - hardeningDisable = [ 1722 - "bindnow" 1723 - "relro" 1724 - ]; 1725 - strictDeps = true; 1726 - nativeBuildInputs = [ pkg-config ]; 1727 - buildInputs = [ 1728 - xorgproto 1729 - libX11 1730 - libXext 1731 - ]; 1732 - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 1733 - meta = { 1734 - pkgConfigModules = [ "applewm" ]; 1735 platforms = lib.platforms.unix; 1736 }; 1737 })
··· 7 gccmakedep, 8 ico, 9 imake, 10 + libapplewm, 11 libpciaccess, 12 libpthread-stubs, 13 libx11, ··· 53 ; 54 fontalias = font-alias; 55 fontutil = font-util; 56 + libAppleWM = libapplewm; 57 libpthreadstubs = libpthread-stubs; 58 libX11 = libx11; 59 libXau = libxau; ··· 1696 passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 1697 meta = { 1698 pkgConfigModules = [ ]; 1699 platforms = lib.platforms.unix; 1700 }; 1701 })
+2
pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
··· 292 gccmakedep, 293 ico, 294 imake, 295 libpciaccess, 296 libpthread-stubs, 297 libx11, ··· 337 ; 338 fontalias = font-alias; 339 fontutil = font-util; 340 libpthreadstubs = libpthread-stubs; 341 libX11 = libx11; 342 libXau = libxau;
··· 292 gccmakedep, 293 ico, 294 imake, 295 + libapplewm, 296 libpciaccess, 297 libpthread-stubs, 298 libx11, ··· 338 ; 339 fontalias = font-alias; 340 fontutil = font-util; 341 + libAppleWM = libapplewm; 342 libpthreadstubs = libpthread-stubs; 343 libX11 = libx11; 344 libXau = libxau;
-10
pkgs/servers/x11/xorg/overrides.nix
··· 150 151 mkfontdir = xorg.mkfontscale; 152 153 - libAppleWM = super.libAppleWM.overrideAttrs (attrs: { 154 - nativeBuildInputs = attrs.nativeBuildInputs ++ [ 155 - autoreconfHook 156 - xorg.utilmacros 157 - ]; 158 - meta = attrs.meta // { 159 - platforms = lib.platforms.darwin; 160 - }; 161 - }); 162 - 163 libXtst = super.libXtst.overrideAttrs (attrs: { 164 meta = attrs.meta // { 165 pkgConfigModules = [ "xtst" ];
··· 150 151 mkfontdir = xorg.mkfontscale; 152 153 libXtst = super.libXtst.overrideAttrs (attrs: { 154 meta = attrs.meta // { 155 pkgConfigModules = [ "xtst" ];
-1
pkgs/servers/x11/xorg/tarballs.list
··· 153 mirror://xorg/individual/font/font-sun-misc-1.0.4.tar.xz 154 mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.4.tar.xz 155 mirror://xorg/individual/font/font-xfree86-type1-1.0.5.tar.xz 156 - https://gitlab.freedesktop.org/xorg/lib/libAppleWM/-/archive/be972ebc3a97292e7d2b2350eff55ae12df99a42/libAppleWM-be972ebc3a97292e7d2b2350eff55ae12df99a42.tar.bz2 157 mirror://xorg/individual/lib/libdmx-1.1.5.tar.xz 158 mirror://xorg/individual/lib/libfontenc-1.1.8.tar.xz 159 mirror://xorg/individual/lib/libFS-1.0.10.tar.xz
··· 153 mirror://xorg/individual/font/font-sun-misc-1.0.4.tar.xz 154 mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.4.tar.xz 155 mirror://xorg/individual/font/font-xfree86-type1-1.0.5.tar.xz 156 mirror://xorg/individual/lib/libdmx-1.1.5.tar.xz 157 mirror://xorg/individual/lib/libfontenc-1.1.8.tar.xz 158 mirror://xorg/individual/lib/libFS-1.0.10.tar.xz