From 5d35a9225ddb45b2cf42506214cf810a2aac80b0 Mon Sep 17 00:00:00 2001 From: Antoine Cotten Date: Mon, 6 Jul 2026 00:11:37 +0200 Subject: [PATCH] cider-2: remove superfluous use of pname NixOS/nixpkgs#277994 --- pkgs/by-name/ci/cider-2/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ci/cider-2/package.nix b/pkgs/by-name/ci/cider-2/package.nix index 22a038fa3a53..501fd5abebf6 100644 --- a/pkgs/by-name/ci/cider-2/package.nix +++ b/pkgs/by-name/ci/cider-2/package.nix @@ -16,12 +16,12 @@ nspr, nss, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cider-2"; version = "4.0.9.1"; src = fetchurl { - url = "https://repo.cider.sh/apt/pool/main/cider-v${version}-linux-x64.deb"; + url = "https://repo.cider.sh/apt/pool/main/cider-v${finalAttrs.version}-linux-x64.deb"; hash = "sha256-MsA6lK3PsyOEx938FgJFx8l9oqwoM3FzIK5goF73lTs="; }; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { # The prefixes that follow LD_LIBRARY_PATH are typically injected via wrapGAppsHook3. # We append them manually instead to avoid a double-wrapping. - makeWrapper $out/lib/cider/Cider $out/bin/${pname} \ + makeWrapper $out/lib/cider/Cider $out/bin/cider-2 \ --add-flags "\$\{NIXOS_OZONE_WL:+\$\{WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true\}\}" \ --add-flags "--no-sandbox --disable-gpu-sandbox" \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \ @@ -70,9 +70,9 @@ stdenv.mkDerivation rec { ''; postFixup = '' - mv $out/share/applications/cider.desktop $out/share/applications/${pname}.desktop - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace-fail Exec=cider Exec=${pname} + mv $out/share/applications/cider.desktop $out/share/applications/cider-2.desktop + substituteInPlace $out/share/applications/cider-2.desktop \ + --replace-fail Exec=cider Exec=cider-2 install -Dm444 $out/share/pixmaps/cider.png \ $out/share/icons/hicolor/256x256/apps/cider.png @@ -94,4 +94,4 @@ stdenv.mkDerivation rec { ]; platforms = [ "x86_64-linux" ]; }; -} +})