Unverified Commit 52dd719b authored by Maximilian Bosch's avatar Maximilian Bosch Committed by GitHub
Browse files

Merge pull request #178832 from ShamrockLee/wine-mainprogram 

wine64Packages: fix mainProgram
parents 924911b1 c25543b5

nixos/doc/manual/from_md/release-notes/rl-2211.section.xml

+7 −0
Original line number Diff line number Diff line
@@ -267,6 +267,13 @@ 
          been removed due to lack of upstream maintenance.

        </para>

      </listitem>

      <listitem>

        <para>

          The <literal>meta.mainProgram</literal> attribute of packages

          in <literal>wineWowPackages</literal> now defaults to

          <literal>&quot;wine64&quot;</literal>.

        </para>

      </listitem>

      <listitem>

        <para>

          (Neo)Vim can not be configured with

nixos/doc/manual/release-notes/rl-2211.section.md

+2 −0
Original line number Diff line number Diff line
@@ -104,6 +104,8 @@ In addition to numerous new and upgraded packages, this release has the followin 
  `python3.pkgs.influxgraph` packages, have been removed due to lack of upstream

  maintenance.



- The `meta.mainProgram` attribute of packages in `wineWowPackages` now defaults to `"wine64"`.



- (Neo)Vim can not be configured with `configure.pathogen` anymore to reduce maintainance burden.

Use `configure.packages` instead.

pkgs/applications/emulators/wine/base.nix

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
  patches,

  vkd3dArches,

  moltenvk,

  buildScript ? null, configureFlags ? []

  buildScript ? null, configureFlags ? [], mainProgram ? "wine"

}:



with import ./util.nix { inherit lib; };
@@ -198,6 +198,6 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { 
    description = if supportFlags.waylandSupport then "An Open Source implementation of the Windows API on top of OpenGL and Unix (with experimental Wayland support)" else "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix";

    platforms = if supportFlags.waylandSupport then (lib.remove "x86_64-darwin" prevPlatforms) else prevPlatforms;

    maintainers = with lib.maintainers; [ avnik raskin bendlas jmc-figueira ];

    mainProgram = "wine";

    inherit mainProgram;

  };

})

pkgs/applications/emulators/wine/packages.nix

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ in with src; { 
    monos =  [ mono ];

    configureFlags = [ "--enable-win64" ];

    platforms = [ "x86_64-linux" "x86_64-darwin" ];

    mainProgram = "wine64";

  };

  wineWow = callPackage ./base.nix {

    pname = "wine-wow";
@@ -40,5 +41,6 @@ in with src; { 
    monos =  [ mono ];

    buildScript = ./builder-wow.sh;

    platforms = [ "x86_64-linux" ];

    mainProgram = "wine64";

  };

}