Unverified Commit 68fd0224 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #279043 from wegank/wxmsw-drop 

windows.wxMSW: drop
parents afb87a92 0c9d7dad

pkgs/os-specific/windows/default.nix

+0 −2
Original line number Diff line number Diff line
@@ -45,7 +45,5 @@ lib.makeScope newScope (self: with self; { 


  pthreads = callPackage ./pthread-w32 { };



  wxMSW = callPackage ./wxMSW-2.8 { };



  libgnurx = callPackage ./libgnurx { };

})

pkgs/os-specific/windows/wxMSW-2.8/default.nix

deleted100644 → 0
+0 −38
Original line number Diff line number Diff line 
{ lib, stdenv, fetchurl, compat24 ? false, compat26 ? true, unicode ? true }:



stdenv.mkDerivation rec {

  pname = "wxMSW";

  version = "2.8.11";



  src = fetchurl {

    url = "mirror://sourceforge/wxwindows/wxWidgets-${version}.tar.gz";

    sha256 = "0icxd21g18d42n1ygshkpw0jnflm03iqki6r623pb5hhd7fm2ksj";

  };



  configureFlags = [

    (if compat24 then "--enable-compat24" else "--disable-compat24")

    (if compat26 then "--enable-compat26" else "--disable-compat26")

    "--disable-precomp-headers"

    (lib.optionalString unicode "--enable-unicode")

    "--with-opengl"

  ];



  preConfigure = "

    substituteInPlace configure --replace /usr /no-such-path

  ";



  postBuild = "(cd contrib/src && make)";



  postInstall = "

    (cd contrib/src && make install)

    (cd $out/include && ln -s wx-*/* .)

  ";



  passthru = { inherit compat24 compat26 unicode; };



  meta = {

    platforms = lib.platforms.windows;



    broken = true;

  };

}

pkgs/top-level/release-cross.nix

+0 −1
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ let 
    libffi = nativePlatforms;

    libtool = nativePlatforms;

    libunistring = nativePlatforms;

    windows.wxMSW = nativePlatforms;

    windows.mingw_w64_pthreads = nativePlatforms;

  };