diff --git a/pkgs/development/libraries/wxmac/default.nix b/pkgs/development/libraries/wxmac/default.nix index d3430f2fcdd..dc80b104a95 100644 --- a/pkgs/development/libraries/wxmac/default.nix +++ b/pkgs/development/libraries/wxmac/default.nix @@ -1,16 +1,11 @@ -{ stdenv, fetchurl, writeScriptBin, - expat, libiconv, libjpeg, libpng, libtiff, zlib +{ stdenv, fetchurl +, expat, libiconv, libjpeg, libpng, libtiff, zlib +, setfile, rez, derez , AGL, Cocoa, Kernel, QuickTime }: with stdenv.lib; -let fake = name: writeScriptBin name '' - #!${stdenv.shell} - echo >&2 "Faking call to ${name} with arguments:" - echo >&2 "$@" -''; in - stdenv.mkDerivation rec { version = "3.0.2"; name = "wxmac-${version}"; @@ -25,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ expat libiconv libjpeg libpng libtiff zlib AGL Cocoa Kernel QuickTime - (fake "Rez") (fake "Setfile") (fake "DeRez") # not open source + setfile rez derez ]; postPatch = '' diff --git a/pkgs/os-specific/darwin/stubs/default.nix b/pkgs/os-specific/darwin/stubs/default.nix new file mode 100644 index 00000000000..ec8f948a00b --- /dev/null +++ b/pkgs/os-specific/darwin/stubs/default.nix @@ -0,0 +1,15 @@ +{ stdenv, writeScriptBin }: + +let fake = name: stdenv.lib.overrideDerivation (writeScriptBin name '' + #!${stdenv.shell} + echo >&2 "Faking call to ${name} with arguments:" + echo >&2 "$@" +'') (drv: { + name = "${name}-stub"; +}); in + +{ + setfile = fake "SetFile"; + rez = fake "Rez"; + derez = fake "DeRez"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7066daa6aad..cbfbf1bce1d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4911,18 +4911,18 @@ let erlangR17_javac = callPackage ../development/interpreters/erlang/R17.nix { javacSupport = true; }; erlangR17_odbc_javac = callPackage ../development/interpreters/erlang/R17.nix { javacSupport = true; odbcSupport = true; }; erlangR18 = callPackage ../development/interpreters/erlang/R18.nix { - inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa; + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; erlangR18_odbc = callPackage ../development/interpreters/erlang/R18.nix { - inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa; + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; odbcSupport = true; }; erlangR18_javac = callPackage ../development/interpreters/erlang/R18.nix { - inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa; + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; javacSupport = true; }; erlangR18_odbc_javac = callPackage ../development/interpreters/erlang/R18.nix { - inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa; + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; javacSupport = true; odbcSupport = true; }; erlang = erlangR18; @@ -8532,16 +8532,19 @@ let wxGTK29 = callPackage ../development/libraries/wxGTK-2.9/default.nix { inherit (gnome) GConf; + inherit (darwin.stubs) setfile; withMesa = lib.elem system lib.platforms.mesaPlatforms; }; wxGTK30 = callPackage ../development/libraries/wxGTK-3.0/default.nix { inherit (gnome) GConf; + inherit (darwin.stubs) setfile; withMesa = lib.elem system lib.platforms.mesaPlatforms; }; wxmac = callPackage ../development/libraries/wxmac { inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel QuickTime; + inherit (darwin.stubs) setfile rez derez; }; wtk = callPackage ../development/libraries/wtk { }; @@ -9627,6 +9630,8 @@ let apple_sdk = callPackage ../os-specific/darwin/apple-sdk {}; libobjc = apple-source-releases.objc4; + + stubs = callPackages ../os-specific/darwin/stubs {}; }; gnustep-make = callPackage ../development/tools/build-managers/gnustep/make {};