From 781cbbf25837da89eaf6bcca747d69fb648322f3 Mon Sep 17 00:00:00 2001 From: Zitrone Date: Sun, 8 Jun 2025 19:24:47 +0200 Subject: [PATCH] libwindowswm: refactor and migrate to pkgs/by-name from xorg.libWindowsWM --- pkgs/by-name/li/libwindowswm/package.nix | 55 +++++++++++++++++++ pkgs/servers/x11/xorg/default.nix | 40 +------------- .../x11/xorg/generate-expr-from-tarballs.pl | 2 + pkgs/servers/x11/xorg/overrides.nix | 4 -- pkgs/servers/x11/xorg/tarballs.list | 1 - 5 files changed, 59 insertions(+), 43 deletions(-) create mode 100644 pkgs/by-name/li/libwindowswm/package.nix diff --git a/pkgs/by-name/li/libwindowswm/package.nix b/pkgs/by-name/li/libwindowswm/package.nix new file mode 100644 index 000000000000..f195e4bbd76b --- /dev/null +++ b/pkgs/by-name/li/libwindowswm/package.nix @@ -0,0 +1,55 @@ +{ + lib, + stdenv, + fetchurl, + pkg-config, + xorgproto, + libx11, + libxext, + writeScript, + testers, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "libwindowswm"; + version = "1.0.1"; + + src = fetchurl { + url = "mirror://xorg/individual/lib/libWindowsWM-${finalAttrs.version}.tar.bz2"; + hash = "sha256-JfB8+EfL6R02wg80i0uUlMRQT+ApZujN9lz1YxanDtw="; + }; + + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + xorgproto + libx11 + libxext + ]; + + configureFlags = lib.optional ( + stdenv.hostPlatform != stdenv.buildPlatform + ) "--enable-malloc0returnsnull"; + + passthru = { + updateScript = writeScript "update-${finalAttrs.pname}" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p common-updater-scripts + version="$(list-directory-versions --pname libWindowsWM \ + --url https://xorg.freedesktop.org/releases/individual/lib/ \ + | sort -V | tail -n1)" + update-source-version ${finalAttrs.pname} "$version" + ''; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + + meta = { + description = "library for Cygwin/X rootless window management extension"; + homepage = "https://gitlab.freedesktop.org/xorg/lib/libwindowswm"; + license = lib.licenses.mit; + maintainers = [ ]; + pkgConfigModules = [ "windowswm" ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 36eeac74ab32..a7af923d1343 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -40,6 +40,7 @@ libpciaccess, libpthread-stubs, libsm, + libwindowswm, libx11, libxau, libxaw, @@ -219,6 +220,7 @@ self: with self; { libICE = libice; libpthreadstubs = libpthread-stubs; libSM = libsm; + libWindowsWM = libwindowswm; libX11 = libx11; libXau = libxau; libXaw = libxaw; @@ -905,44 +907,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - libWindowsWM = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - xorgproto, - libX11, - libXext, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "libWindowsWM"; - version = "1.0.1"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2"; - sha256 = "1p0flwb67xawyv6yhri9w17m1i4lji5qnd0gq8v1vsfb8zw7rw15"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - xorgproto - libX11 - libXext - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ "windowswm" ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! libXTrap = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 958a76b60c98..251889282998 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -367,6 +367,7 @@ print OUT <