Unverified Commit 86907f0c authored by Michael Daniels's avatar Michael Daniels Committed by GitHub
Browse files

various: remove superflous usage of pname (#455395)

parents 67e89ff7 74d587a4

pkgs/by-name/al/alda/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ let 
  license = lib.licenses.epl20;



  alda_client = buildGoModule {

    pname = "${pname}-client";

    pname = "alda-client";

    inherit version src;



    sourceRoot = "${src.name}/client";
@@ -51,7 +51,7 @@ let 
    };

  };

  alda_player = stdenv.mkDerivation {

    pname = "${pname}-player";

    pname = "alda-player";

    inherit version src;



    sourceRoot = "${src.name}/player";

pkgs/by-name/al/alephone/package.nix

+8 −9
Original line number Diff line number Diff line
@@ -106,7 +106,6 @@ stdenv.mkDerivation (finalAttrs: { 


  passthru.makeWrapper =

    {

      pname,

      desktopName,

      version,

      zip,
@@ -116,12 +115,12 @@ stdenv.mkDerivation (finalAttrs: { 
    }@extraArgs:

    stdenv.mkDerivation (

      {

        inherit pname version;

        inherit version;



        desktopItem = makeDesktopItem {

          name = desktopName;

          exec = pname;

          genericName = pname;

          exec = "alephone";

          genericName = "alephone";

          categories = [ "Game" ];

          comment = meta.description;

          inherit desktopName icon;
@@ -138,11 +137,11 @@ stdenv.mkDerivation (finalAttrs: { 
        dontBuild = true;



        installPhase = ''

          mkdir -p $out/bin $out/data/$pname $out/share/applications

          cp -a * $out/data/$pname

          mkdir -p $out/bin $out/data/alephone $out/share/applications

          cp -a * $out/data/alephone

          cp $desktopItem/share/applications/* $out/share/applications

          makeWrapper ${finalAttrs.finalPackage}/bin/alephone $out/bin/$pname \

            --add-flags $out/data/$pname

          makeWrapper ${finalAttrs.finalPackage}/bin/alephone $out/bin/alephone \

            --add-flags $out/data/alephone

        '';

      }

      // extraArgs
@@ -151,7 +150,7 @@ stdenv.mkDerivation (finalAttrs: { 
          finalAttrs.finalPackage.meta

          // {

            license = lib.licenses.free;

            mainProgram = pname;

            mainProgram = "alephone";

            hydraPlatforms = [ ];

          }

          // meta;

pkgs/by-name/de/deepgit/package.nix

+4 −4
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec { 


  desktopItems = [

    (makeDesktopItem rec {

      name = pname;

      name = "deepgit";

      desktopName = "DeepGit";

      keywords = [ "git" ];

      comment = "Git-Client";
@@ -59,12 +59,12 @@ stdenv.mkDerivation rec { 
      terminal = false;

      startupNotify = true;

      startupWMClass = desktopName;

      exec = pname;

      exec = "deepgit";

      mimeTypes = [

        "x-scheme-handler/${pname}"

        "x-scheme-handler/deepgit"

        "x-scheme-handler/sourcetree"

      ];

      icon = pname;

      icon = "deepgit";

    })

  ];

pkgs/by-name/gc/gcab/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec { 


  passthru = {

    updateScript = gnome.updateScript {

      packageName = pname;

      packageName = "gcab";

      versionPolicy = "none";

    };

pkgs/by-name/gr/grilo/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec { 
  setupHook = ./setup-hook.sh;



  src = fetchurl {

    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";

    url = "mirror://gnome/sources/grilo/${lib.versions.majorMinor version}/grilo-${version}.tar.xz";

    sha256 = "CGnIHRmrE5xmfXlWfBTdy2y1y/wBCNBMreKH6ylTZwY=";

  };
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec { 


  passthru = {

    updateScript = gnome.updateScript {

      packageName = pname;

      packageName = "grilo";

      versionPolicy = "none";

    };

  };