public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wxmac: clean up and provide with stub packages

Browse Source
This commit is contained in:
Jude Taylor 2015-10-28 17:36:20 -07:00
parent e6bc23a801
commit 3b2b2ab046
3 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/wxmac/default.nix
View File

@ -1,16 +1,11 @@
{ stdenv, fetchurl, writeScriptBin, { stdenv, fetchurl
expat, libiconv, libjpeg, libpng, libtiff, zlib , expat, libiconv, libjpeg, libpng, libtiff, zlib
, setfile, rez, derez
, AGL, Cocoa, Kernel, QuickTime , AGL, Cocoa, Kernel, QuickTime
}: }:
with stdenv.lib; with stdenv.lib;
let fake = name: writeScriptBin name ''
#!${stdenv.shell}
echo >&2 "Faking call to ${name} with arguments:"
echo >&2 "$@"
''; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "3.0.2"; version = "3.0.2";
name = "wxmac-${version}"; name = "wxmac-${version}";
@ -25,7 +20,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
expat libiconv libjpeg libpng libtiff zlib expat libiconv libjpeg libpng libtiff zlib
AGL Cocoa Kernel QuickTime AGL Cocoa Kernel QuickTime
(fake "Rez") (fake "Setfile") (fake "DeRez") # not open source setfile rez derez
]; ];
postPatch = '' postPatch = ''

15
pkgs/os-specific/darwin/stubs/default.nix Normal file
View File

@ -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";
}

13
pkgs/top-level/all-packages.nix
View File

@ -4911,18 +4911,18 @@ let
erlangR17_javac = callPackage ../development/interpreters/erlang/R17.nix { javacSupport = true; }; erlangR17_javac = callPackage ../development/interpreters/erlang/R17.nix { javacSupport = true; };
erlangR17_odbc_javac = callPackage ../development/interpreters/erlang/R17.nix { javacSupport = true; odbcSupport = true; }; erlangR17_odbc_javac = callPackage ../development/interpreters/erlang/R17.nix { javacSupport = true; odbcSupport = true; };
erlangR18 = callPackage ../development/interpreters/erlang/R18.nix { 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 { 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; odbcSupport = true;
}; };
erlangR18_javac = callPackage ../development/interpreters/erlang/R18.nix { 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; javacSupport = true;
}; };
erlangR18_odbc_javac = callPackage ../development/interpreters/erlang/R18.nix { 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; javacSupport = true; odbcSupport = true;
}; };
erlang = erlangR18; erlang = erlangR18;
@ -8532,16 +8532,19 @@ let
wxGTK29 = callPackage ../development/libraries/wxGTK-2.9/default.nix { wxGTK29 = callPackage ../development/libraries/wxGTK-2.9/default.nix {
inherit (gnome) GConf; inherit (gnome) GConf;
inherit (darwin.stubs) setfile;
withMesa = lib.elem system lib.platforms.mesaPlatforms; withMesa = lib.elem system lib.platforms.mesaPlatforms;
}; };
wxGTK30 = callPackage ../development/libraries/wxGTK-3.0/default.nix { wxGTK30 = callPackage ../development/libraries/wxGTK-3.0/default.nix {
inherit (gnome) GConf; inherit (gnome) GConf;
inherit (darwin.stubs) setfile;
withMesa = lib.elem system lib.platforms.mesaPlatforms; withMesa = lib.elem system lib.platforms.mesaPlatforms;
}; };
wxmac = callPackage ../development/libraries/wxmac { wxmac = callPackage ../development/libraries/wxmac {
inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel QuickTime; inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel QuickTime;
inherit (darwin.stubs) setfile rez derez;
}; };
wtk = callPackage ../development/libraries/wtk { }; wtk = callPackage ../development/libraries/wtk { };
@ -9627,6 +9630,8 @@ let
apple_sdk = callPackage ../os-specific/darwin/apple-sdk {}; apple_sdk = callPackage ../os-specific/darwin/apple-sdk {};
libobjc = apple-source-releases.objc4; libobjc = apple-source-releases.objc4;
stubs = callPackages ../os-specific/darwin/stubs {};
}; };
gnustep-make = callPackage ../development/tools/build-managers/gnustep/make {}; gnustep-make = callPackage ../development/tools/build-managers/gnustep/make {};