From ec2c6af0f1a5a09c202ca9436bcdad8d80f86034 Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Mon, 25 Apr 2022 09:11:00 -0500 Subject: [PATCH] wmii: hg-2012-12-09 -> unstable-2022-04-04 --- .../window-managers/wmii-hg/default.nix | 46 ------------ .../window-managers/wmii/default.nix | 72 +++++++++++++++++++ .../{libixp-hg => libixp}/default.nix | 2 +- pkgs/top-level/aliases.nix | 2 + pkgs/top-level/all-packages.nix | 4 +- 5 files changed, 77 insertions(+), 49 deletions(-) delete mode 100644 pkgs/applications/window-managers/wmii-hg/default.nix create mode 100644 pkgs/applications/window-managers/wmii/default.nix rename pkgs/development/libraries/{libixp-hg => libixp}/default.nix (97%) diff --git a/pkgs/applications/window-managers/wmii-hg/default.nix b/pkgs/applications/window-managers/wmii-hg/default.nix deleted file mode 100644 index 6759e15ee83..00000000000 --- a/pkgs/applications/window-managers/wmii-hg/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, stdenv, fetchurl, unzip, pkg-config, libixp_hg, txt2tags, dash, python2, which -, libX11 , libXrender, libXext, libXinerama, libXrandr, libXft }: - -stdenv.mkDerivation rec { - rev = "2823"; - version = "hg-2012-12-09"; - pname = "wmii"; - - src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/wmii/source-archive.zip"; - sha256 = "1wmkq14zvmfrmydl8752xz852cy7agrx3qp4fy2cc5asb2r9abaz"; - }; - - # for dlopen-ing - patchPhase = '' - substituteInPlace lib/libstuff/x11/xft.c --replace "libXft.so" "$(pkg-config --variable=libdir xft)/libXft.so.2" - substituteInPlace cmd/wmii.sh.sh --replace "\$(which which)" "${which}/bin/which" - ''; - - configurePhase = '' - for file in $(grep -lr '#!.*sh'); do - sed -i 's|#!.*sh|#!${dash}/bin/dash|' $file - done - - cat <> config.mk - PREFIX = $out - LIBIXP = ${libixp_hg}/lib/libixp.a - BINSH = ${dash}/bin/dash - EOF - ''; - - nativeBuildInputs = [ pkg-config unzip ]; - buildInputs = [ libixp_hg txt2tags dash python2 which - libX11 libXrender libXext libXinerama libXrandr libXft ]; - - # For some reason including mercurial in buildInputs did not help - makeFlags = [ "WMII_HGVERSION=hg${rev}" ]; - - meta = { - homepage = "https://suckless.org/"; # https://wmii.suckless.org/ does not exist anymore - description = "A small window manager controlled by a 9P filesystem"; - maintainers = with lib.maintainers; [ kovirobi ]; - license = lib.licenses.mit; - platforms = with lib.platforms; linux; - }; -} diff --git a/pkgs/applications/window-managers/wmii/default.nix b/pkgs/applications/window-managers/wmii/default.nix new file mode 100644 index 00000000000..11f669da37a --- /dev/null +++ b/pkgs/applications/window-managers/wmii/default.nix @@ -0,0 +1,72 @@ +{ lib, stdenv +, fetchFromGitHub +, dash +, libX11 +, libXext +, libXft +, libXinerama +, libXrandr +, libXrender +, libixp +, pkg-config +, txt2tags +, unzip +, which +}: + +stdenv.mkDerivation rec { + pname = "wmii"; + version = "unstable-2022-04-04"; + + src = fetchFromGitHub { + owner = "0intro"; + repo = "wmii"; + rev = "ff120c7fee6e1b3a30a4a800074394327fb1da9d"; + hash = "sha256-KEmWnobpT/5TdgT2HGPCpG1duz9Q6Z6PFSEBs2Ce+7g="; + }; + + # for dlopen-ing + postPatch = '' + substituteInPlace lib/libstuff/x11/xft.c --replace "libXft.so" "$(pkg-config --variable=libdir xft)/libXft.so.2" + substituteInPlace cmd/wmii.sh.sh --replace "\$(which which)" "${which}/bin/which" + ''; + + postConfigure = '' + for file in $(grep -lr '#!.*sh'); do + sed -i 's|#!.*sh|#!${dash}/bin/dash|' $file + done + + cat <> config.mk + PREFIX = $out + LIBIXP = ${libixp}/lib/libixp.a + BINSH = ${dash}/bin/dash + EOF + ''; + + # Remove optional python2 functionality + postInstall = '' + rm -rf $out/lib/python* $out/etc/wmii-hg/python + ''; + + nativeBuildInputs = [ pkg-config unzip ]; + buildInputs = [ + dash + libX11 + libXext + libXft + libXinerama + libXrandr + libXrender + libixp + txt2tags + which + ]; + + meta = { + homepage = "https://github.com/0intro/wmii"; + description = "A small, scriptable window manager, with a 9P filesystem interface and an acme-like layout"; + maintainers = with lib.maintainers; [ kovirobi ]; + license = lib.licenses.mit; + platforms = with lib.platforms; linux; + }; +} diff --git a/pkgs/development/libraries/libixp-hg/default.nix b/pkgs/development/libraries/libixp/default.nix similarity index 97% rename from pkgs/development/libraries/libixp-hg/default.nix rename to pkgs/development/libraries/libixp/default.nix index 16b714cb7ae..255f4ef3056 100644 --- a/pkgs/development/libraries/libixp-hg/default.nix +++ b/pkgs/development/libraries/libixp/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { hash = "sha256-S25DmXJ7fN0gXLV0IzUdz8hXPTYEHmaSG7Mnli6GQVc="; }; - configurePhase = '' + postConfigure = '' sed -i -e "s|^PREFIX.*=.*$|PREFIX = $out|" config.mk ''; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 437fd6b8aba..c20f08ed4ee 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -647,6 +647,7 @@ mapAliases ({ libgroove = throw "libgroove has been removed, because it depends on an outdated and insecure version of ffmpeg"; # Added 2022-01-21 libgumbo = throw "'libgumbo' has been renamed to/replaced by 'gumbo'"; # Converted to throw 2022-02-22 libintlOrEmpty = lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # Added 2018-03-14 + libixp_hg = libixp; libjpeg_drop = libjpeg_original; # Added 2020-06-05 libjson_rpc_cpp = throw "'libjson_rpc_cpp' has been renamed to/replaced by 'libjson-rpc-cpp'"; # Converted to throw 2022-02-22 libkml = throw "libkml has been removed from nixpkgs, as it's abandoned and no package needed it"; # Added 2021-11-09 @@ -1358,6 +1359,7 @@ mapAliases ({ winpdb = throw "winpdb has been removed: abandoned by upstream"; # Added 2022-04-22 winusb = throw "'winusb' has been renamed to/replaced by 'woeusb'"; # Converted to throw 2022-02-22 wireguard = throw "'wireguard' has been renamed to/replaced by 'wireguard-tools'"; # Converted to throw 2022-02-22 + wmii_hg = wmii; wxmupen64plus = throw "wxmupen64plus was removed because the upstream disappeared"; # Added 2022-01-31 ### X ### diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bfed559ece1..ef809e7d5f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19329,7 +19329,7 @@ with pkgs; libxsmm = callPackage ../development/libraries/libxsmm { }; - libixp_hg = callPackage ../development/libraries/libixp-hg { }; + libixp = callPackage ../development/libraries/libixp { }; libwpe = callPackage ../development/libraries/libwpe { }; @@ -30402,7 +30402,7 @@ with pkgs; wmderlandc = callPackage ../applications/window-managers/wmderlandc { }; - wmii_hg = callPackage ../applications/window-managers/wmii-hg { }; + wmii = callPackage ../applications/window-managers/wmii { }; wofi = callPackage ../applications/misc/wofi { };