From ef7f010d24acdbffbd713d25e8bafd9e20025f93 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 21 Aug 2025 09:00:52 +0200 Subject: [PATCH] wraith: move to by-name --- .../irc => by-name/wr}/wraith/configure.patch | 0 .../irc => by-name/wr}/wraith/dlopen.patch | 0 .../default.nix => by-name/wr/wraith/package.nix} | 12 ++++++------ pkgs/top-level/all-packages.nix | 4 ---- 4 files changed, 6 insertions(+), 10 deletions(-) rename pkgs/{applications/networking/irc => by-name/wr}/wraith/configure.patch (100%) rename pkgs/{applications/networking/irc => by-name/wr}/wraith/dlopen.patch (100%) rename pkgs/{applications/networking/irc/wraith/default.nix => by-name/wr/wraith/package.nix} (92%) diff --git a/pkgs/applications/networking/irc/wraith/configure.patch b/pkgs/by-name/wr/wraith/configure.patch similarity index 100% rename from pkgs/applications/networking/irc/wraith/configure.patch rename to pkgs/by-name/wr/wraith/configure.patch diff --git a/pkgs/applications/networking/irc/wraith/dlopen.patch b/pkgs/by-name/wr/wraith/dlopen.patch similarity index 100% rename from pkgs/applications/networking/irc/wraith/dlopen.patch rename to pkgs/by-name/wr/wraith/dlopen.patch diff --git a/pkgs/applications/networking/irc/wraith/default.nix b/pkgs/by-name/wr/wraith/package.nix similarity index 92% rename from pkgs/applications/networking/irc/wraith/default.nix rename to pkgs/by-name/wr/wraith/package.nix index 1a6f26aa2699..774de51eee94 100644 --- a/pkgs/applications/networking/irc/wraith/default.nix +++ b/pkgs/by-name/wr/wraith/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchurl, - openssl, + openssl_1_1, }: stdenv.mkDerivation rec { @@ -13,16 +13,16 @@ stdenv.mkDerivation rec { sha256 = "1h8159g6wh1hi69cnhqkgwwwa95fa6z1zrzjl219mynbf6vjjzkw"; }; hardeningDisable = [ "format" ]; - buildInputs = [ openssl ]; + buildInputs = [ openssl_1_1 ]; patches = [ ./configure.patch ./dlopen.patch ]; postPatch = '' - substituteInPlace configure --subst-var-by openssl.dev ${openssl.dev} \ - --subst-var-by openssl-lib ${lib.getLib openssl} - substituteInPlace src/libssl.cc --subst-var-by openssl ${lib.getLib openssl} - substituteInPlace src/libcrypto.cc --subst-var-by openssl ${lib.getLib openssl} + substituteInPlace configure --subst-var-by openssl.dev ${openssl_1_1.dev} \ + --subst-var-by openssl-lib ${lib.getLib openssl_1_1} + substituteInPlace src/libssl.cc --subst-var-by openssl ${lib.getLib openssl_1_1} + substituteInPlace src/libcrypto.cc --subst-var-by openssl ${lib.getLib openssl_1_1} ''; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7a1b578e9317..bba4e77c80a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15847,10 +15847,6 @@ with pkgs; } ); - wraith = callPackage ../applications/networking/irc/wraith { - openssl = openssl_1_1; - }; - xsw = callPackage ../applications/misc/xsw { # Enable the next line to use this in terminal. # Note that it requires sixel capable terminals such as mlterm