Unverified Commit cda22db9 authored by Felix Bühler's avatar Felix Bühler Committed by GitHub
Browse files

treewide: use pname and version (#460481)

parents 700e0ef9 2722f500
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -174,7 +174,6 @@ rec {
    };

    meta = redshift.meta // {
      name = "${pname}-${version}";
      longDescription = "Gammastep" + lib.removePrefix "Redshift" redshift.meta.longDescription;
      homepage = "https://gitlab.com/chinstrap/gammastep";
      mainProgram = "gammastep";
+3 −4
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@
let
  pname = "cables";
  version = "0.8.0";
  name = "${pname}-${version}";

  src = fetchurl {
    url = "https://github.com/cables-gl/cables_electron/releases/download/v${version}/cables-${version}-linux-x64.AppImage";
@@ -18,7 +17,7 @@ let
  appimageContents = appimageTools.extract {
    inherit pname version src;
    postExtract = ''
      substituteInPlace $out/${pname}-${version}.desktop --replace 'Exec=AppRun' 'Exec=cables'
      substituteInPlace $out/cables-${version}.desktop --replace 'Exec=AppRun' 'Exec=cables'
    '';
  };

@@ -27,8 +26,8 @@ appimageTools.wrapType2 {
  inherit pname version src;

  extraInstallCommands = ''
    install -m 444 -D ${appimageContents}/${name}.desktop $out/share/applications/cables.desktop
    install -m 444 -D ${appimageContents}/${name}.png $out/share/icons/hicolor/512x512/apps/cables.png
    install -m 444 -D ${appimageContents}/cables-${version}.desktop $out/share/applications/cables.desktop
    install -m 444 -D ${appimageContents}/cables-${version}.png $out/share/icons/hicolor/512x512/apps/cables.png
  '';

  meta = {
+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@
let
  pname = "capacities";
  version = "1.52.6";
  name = "${pname}-${version}";

  src = fetchurl {
    url = "https://web.archive.org/web/20250519011655/https://capacities-desktop-app.fra1.cdn.digitaloceanspaces.com/capacities-${version}.AppImage";
+3 −4
Original line number Diff line number Diff line
@@ -12,15 +12,14 @@
}:

let
  pname = "clutter-gtk";
  version = "1.8.4";
in

stdenv.mkDerivation rec {
  name = "${pname}-${version}";
  pname = "clutter-gtk";
  inherit version;

  src = fetchurl {
    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
    url = "mirror://gnome/sources/clutter-gtk/${lib.versions.majorMinor version}/clutter-gtk-${version}.tar.xz";
    sha256 = "01ibniy4ich0fgpam53q252idm7f4fn5xg5qvizcfww90gn9652j";
  };

+5 −5
Original line number Diff line number Diff line
@@ -25,14 +25,14 @@
}:

let
  pname = "clutter";
  version = "1.26.4";
in
stdenv.mkDerivation rec {
  name = "${pname}-${version}";
stdenv.mkDerivation {
  pname = "clutter";
  inherit version;

  src = fetchurl {
    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
    url = "mirror://gnome/sources/clutter/${lib.versions.majorMinor version}/clutter-${version}.tar.xz";
    sha256 = "1rn4cd1an6a9dfda884aqpcwcgq8dgydpqvb19nmagw4b70zlj4b";
  };

@@ -85,7 +85,7 @@ stdenv.mkDerivation rec {

  passthru = {
    updateScript = gnome.updateScript {
      packageName = pname;
      packageName = "clutter";
      versionPolicy = "odd-unstable";
    };
  };
Loading