From 55bd133882a07ecbce9e563fb58f3a69b28dcf15 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Mon, 2 Jun 2025 23:06:14 -0400 Subject: [PATCH 1/2] icewm: enable on darwin Signed-off-by: Ihar Hrachyshka XXX Signed-off-by: Ihar Hrachyshka --- pkgs/by-name/ic/icewm/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ic/icewm/package.nix b/pkgs/by-name/ic/icewm/package.nix index 78343cb0a49d..1e527d8663a6 100644 --- a/pkgs/by-name/ic/icewm/package.nix +++ b/pkgs/by-name/ic/icewm/package.nix @@ -1,6 +1,6 @@ { lib, - stdenv, + gccStdenv, fetchFromGitHub, cmake, expat, @@ -39,7 +39,7 @@ pkg-config, }: -stdenv.mkDerivation (finalAttrs: { +gccStdenv.mkDerivation (finalAttrs: { pname = "icewm"; version = "3.7.5"; @@ -99,6 +99,8 @@ stdenv.mkDerivation (finalAttrs: { "-DCFGDIR=/etc/icewm" ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString gccStdenv.hostPlatform.isDarwin "-D_DARWIN_C_SOURCE"; + # install legacy themes postInstall = '' cp -r ../lib/themes/{gtk2,Natural,nice,nice2,warp3,warp4,yellowmotif} \ @@ -123,6 +125,6 @@ stdenv.mkDerivation (finalAttrs: { ''; license = licenses.lgpl2Only; maintainers = [ ]; - platforms = platforms.linux; + platforms = platforms.unix; }; }) From 5957890e5b1992299ae426f8596d7ee8ab0db5db Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Mon, 2 Jun 2025 23:07:08 -0400 Subject: [PATCH 2/2] icewm: modernize Signed-off-by: Ihar Hrachyshka --- pkgs/by-name/ic/icewm/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ic/icewm/package.nix b/pkgs/by-name/ic/icewm/package.nix index 1e527d8663a6..d5d0ed8eae36 100644 --- a/pkgs/by-name/ic/icewm/package.nix +++ b/pkgs/by-name/ic/icewm/package.nix @@ -107,7 +107,7 @@ gccStdenv.mkDerivation (finalAttrs: { $out/share/icewm/themes/ ''; - meta = with lib; { + meta = { homepage = "https://ice-wm.org/"; description = "Simple, lightweight X window manager"; longDescription = '' @@ -123,8 +123,8 @@ gccStdenv.mkDerivation (finalAttrs: { optional external background wallpaper manager with transparency support, a simple session manager and a system tray. ''; - license = licenses.lgpl2Only; + license = lib.licenses.lgpl2Only; maintainers = [ ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; })