diff options
Diffstat (limited to 'pkgs/os-specific')
14 files changed, 56 insertions, 42 deletions
diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix index a62182f1d347..c23a2148143a 100644 --- a/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -71,6 +71,8 @@ let # because we copy files from the system preferLocalBuild = true; + disallowedRequisites = [ sdk ]; + installPhase = '' linkFramework() { local path="$1" @@ -160,8 +162,8 @@ in rec { installPhase = '' mkdir -p $out/include pushd $out/include >/dev/null - ln -s "${lib.getDev sdk}/include/xpc" - ln -s "${lib.getDev sdk}/include/launch.h" + cp -r "${lib.getDev sdk}/include/xpc" $out/include/xpc + cp "${lib.getDev sdk}/include/launch.h" $out/include/launch.h popd >/dev/null ''; }; diff --git a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix index f8c424089f09..9e47b8d02fdf 100644 --- a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix +++ b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix @@ -86,7 +86,6 @@ with frameworks; with libs; { QTKit = [ CoreMediaIO CoreMedia MediaToolbox QuickTime VideoToolbox ]; QuickLook = [ ApplicationServices CF ]; QuickTime = [ ApplicationServices AudioUnit Carbon CoreAudio CoreServices OpenGL QuartzCore ]; - Ruby = []; SceneKit = []; ScreenSaver = []; Scripting = []; diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix index 369556fd5a1c..d325e38b272e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix @@ -10,8 +10,10 @@ appleDerivation { sed -i 's/darwin\*/ios\*/g' configure libcharset/configure ''; - configureFlags = lib.optional enableStatic "--enable-static" - ++ lib.optional (!enableShared) "--disable-shared"; + configureFlags = [ + (lib.enableFeature enableStatic "static") + (lib.enableFeature enableShared "shared") + ]; postInstall = lib.optionalString (!enableStatic) '' mv $out/lib/libiconv.dylib $out/lib/libiconv-nocharset.dylib diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix index 6730e2424be4..7986706cb647 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix @@ -26,8 +26,9 @@ name: version: sha256: args: let ''; preBuild = '' ln -s lib ${n} - makeFlagsArray=(-j''$NIX_BUILD_CORES) + makeFlagsArray=(-j$NIX_BUILD_CORES) ''; + outputs = [ "out" "dev" ]; buildInputs = [ pkgs.gnustep.make pkgs.darwin.apple_sdk.frameworks.AppKit @@ -51,6 +52,7 @@ name: version: sha256: args: let "-iframework ${pkgs.darwin.Security}/Library/Frameworks" "-I." "-Wno-deprecated-declarations" + "-DNDEBUG" ]; NIX_LDFLAGS = with pkgs.darwin; with apple_sdk.frameworks; [ "-L${libobjc}/lib" diff --git a/pkgs/os-specific/darwin/apple-source-releases/libsecurityd/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libsecurityd/default.nix index 48bb80eb7511..fb3441f70507 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libsecurityd/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libsecurityd/default.nix @@ -9,7 +9,7 @@ appleDerivation { unpackFile ${libsecurity_cdsa_client.src} mv libsecurity_cdsa_client*/lib security_cdsa_client ln -s lib securityd_client - + patch -p1 < ${./xdr-arity.patch} ''; preBuild = '' @@ -17,7 +17,7 @@ appleDerivation { cp derived_src/* lib rm lib/ucspClientC.c ''; - postInstall = '' - ln -s ''$out/include/securityd ''$out/include/securityd_client + postFixup = '' + ln -s $dev/include/securityd $dev/include/securityd_client ''; } diff --git a/pkgs/os-specific/darwin/security-tool/default.nix b/pkgs/os-specific/darwin/security-tool/default.nix index e6846aef7507..4566d82835f7 100644 --- a/pkgs/os-specific/darwin/security-tool/default.nix +++ b/pkgs/os-specific/darwin/security-tool/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { sha256 = "0apcz4vy2z5645jhrs60wj3w27mncjjqv42h5lln36g6qs2n9113"; }; + disallowedRequisites = [ apple_sdk.sdk ]; + patchPhase = '' # copied from libsecurity_generic cp -R ${osx_private_sdk}/include/SecurityPrivateHeaders Security @@ -34,7 +36,7 @@ stdenv.mkDerivation rec { ''; preBuild = '' - makeFlagsArray=(-j''$NIX_BUILD_CORES) + makeFlagsArray=(-j$NIX_BUILD_CORES) ''; NIX_LDFLAGS = "-no_dtrace_dof"; @@ -97,4 +99,3 @@ stdenv.mkDerivation rec { license = licenses.apsl20; }; } - diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index b7928e38fc98..ad21a6a4dcd6 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -6,11 +6,11 @@ assert enablePython -> python != null; stdenv.mkDerivation rec { - name = "audit-2.8.3"; + name = "audit-2.8.4"; src = fetchurl { url = "https://people.redhat.com/sgrubb/audit/${name}.tar.gz"; - sha256 = "06lacv9zjn0sf076dydwmvjhdmik3xzhdjvyrkq75917xv54ajbl"; + sha256 = "0f4ci6ffznnmgblwgv7ich9mjfk3p6y5l6m6h3chhmzw156nj454"; }; outputs = [ "bin" "dev" "out" "man" ]; diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 1a8f7f768626..06a2d4301596 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -33,14 +33,14 @@ let in stdenv.mkDerivation rec { - name = "busybox-1.28.4"; + name = "busybox-1.29.0"; # Note to whoever is updating busybox: please verify that: # nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test # still builds after the update. src = fetchurl { url = "https://busybox.net/downloads/${name}.tar.bz2"; - sha256 = "0smfn8hlds6nx8war62kyaykg3n7mxbjjfcpsgz84znwk4v4mhg3"; + sha256 = "10hccqprhr1mwkqc9i3kny44mb6sdmv9hl63wx20cr5yy095c4f8"; }; hardeningDisable = [ "format" ] ++ lib.optionals enableStatic [ "fortify" ]; diff --git a/pkgs/os-specific/linux/checkpolicy/default.nix b/pkgs/os-specific/linux/checkpolicy/default.nix index 6ea73c9ac6c3..ac4bc83c51de 100644 --- a/pkgs/os-specific/linux/checkpolicy/default.nix +++ b/pkgs/os-specific/linux/checkpolicy/default.nix @@ -13,10 +13,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ bison flex ]; buildInputs = [ libsepol ]; - preBuild = '' - makeFlagsArray+=("LIBDIR=${libsepol}/lib") - makeFlagsArray+=("PREFIX=$out") - ''; + makeFlags = [ + "PREFIX=$(out)" + "LIBSEPOLA=${stdenv.lib.getLib libsepol}/lib/libsepol.a" + ]; meta = libsepol.meta // { description = "SELinux policy compiler"; diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix index a172e45e7faa..a464e7cbf715 100644 --- a/pkgs/os-specific/linux/libselinux/default.nix +++ b/pkgs/os-specific/linux/libselinux/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { version = "2.7"; inherit (libsepol) se_release se_url; + outputs = [ "bin" "out" "dev" "man" "py" ]; + src = fetchurl { url = "${se_url}/${se_release}/libselinux-${version}.tar.gz"; sha256 = "0mwcq78v6ngbq06xmb9dvilpg0jnl2vs9fgrpakhmmiskdvc1znh"; @@ -27,19 +29,19 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; - postPatch = optionalString enablePython '' - sed -i -e 's|\$(LIBDIR)/libsepol.a|${libsepol}/lib/libsepol.a|' src/Makefile - ''; - - # fix install locations - preBuild = '' - makeFlagsArray+=("PREFIX=$out") - makeFlagsArray+=("DESTDIR=$out") - makeFlagsArray+=("MAN3DIR=$out/share/man/man3") - makeFlagsArray+=("MAN5DIR=$out/share/man/man5") - makeFlagsArray+=("MAN8DIR=$out/share/man/man8") - makeFlagsArray+=("PYSITEDIR=$out/lib/${python.libPrefix}/site-packages") - ''; + makeFlags = [ + "PREFIX=$(out)" + "INCDIR=$(dev)/include/selinux" + "INCLUDEDIR=$(dev)/include" + "MAN3DIR=$(man)/share/man/man3" + "MAN5DIR=$(man)/share/man/man5" + "MAN8DIR=$(man)/share/man/man8" + "PYSITEDIR=$(py)/${python.sitePackages}" + "SBINDIR=$(bin)/sbin" + "SHLIBDIR=$(out)/lib" + + "LIBSEPOLA=${stdenv.lib.getLib libsepol}/lib/libsepol.a" + ]; installTargets = [ "install" ] ++ optional enablePython "install-pywrap"; diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix index 40872f7c1ac8..f16c241a0a1f 100644 --- a/pkgs/os-specific/linux/libsepol/default.nix +++ b/pkgs/os-specific/linux/libsepol/default.nix @@ -6,6 +6,8 @@ stdenv.mkDerivation rec { se_release = "20170804"; se_url = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases"; + outputs = [ "bin" "out" "dev" "man" ]; + src = fetchurl { url = "${se_url}/${se_release}/libsepol-${version}.tar.gz"; sha256 = "1rzr90d3f1g5wy1b8sh6fgnqb9migys2zgpjmpakn6lhxkc3p7fn"; @@ -13,18 +15,22 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ flex ]; - preBuild = '' - makeFlagsArray+=("PREFIX=$out") - makeFlagsArray+=("DESTDIR=$out") - makeFlagsArray+=("MAN8DIR=$out/share/man/man8") - makeFlagsArray+=("MAN3DIR=$out/share/man/man3") - ''; + makeFlags = [ + "PREFIX=$(out)" + "BINDIR=$(bin)/bin" + "INCDIR=$(dev)/include/sepol" + "INCLUDEDIR=$(dev)/include" + "MAN3DIR=$(man)/share/man/man3" + "MAN8DIR=$(man)/share/man/man8" + "SHLIBDIR=$(out)/lib" + ]; NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; passthru = { inherit se_release se_url; }; meta = with stdenv.lib; { + description = "SELinux binary policy manipulation library"; homepage = http://userspace.selinuxproject.org; platforms = platforms.linux; maintainers = [ maintainers.phreedom ]; diff --git a/pkgs/os-specific/linux/selinux-python/default.nix b/pkgs/os-specific/linux/selinux-python/default.nix index 8ac207d64214..527c94de46b3 100644 --- a/pkgs/os-specific/linux/selinux-python/default.nix +++ b/pkgs/os-specific/linux/selinux-python/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { makeFlagsArray+=("PREFIX=$out") makeFlagsArray+=("DESTDIR=$out") makeFlagsArray+=("LOCALEDIR=$out/share/locale") - makeFlagsArray+=("LIBSEPOLA=${libsepol}/lib/libsepol.a") + makeFlagsArray+=("LIBSEPOLA=${stdenv.lib.getLib libsepol}/lib/libsepol.a") makeFlagsArray+=("BASHCOMPLETIONDIR=$out/share/bash-completion/completions") makeFlagsArray+=("PYTHON=${python3}/bin/python") makeFlagsArray+=("PYTHONLIBDIR=lib/${python3.libPrefix}/site-packages") diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix index 9cb5785ca98f..89375563ae67 100644 --- a/pkgs/os-specific/linux/setools/default.nix +++ b/pkgs/os-specific/linux/setools/default.nix @@ -30,7 +30,7 @@ buildPythonApplication rec { setupPyBuildFlags = [ "-i" ]; preBuild = '' - export SEPOL="${libsepol}/lib/libsepol.a" + export SEPOL="${stdenv.lib.getLib libsepol}/lib/libsepol.a" ''; meta = { diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index c2c05a6b99ed..3dce750d255e 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -70,8 +70,8 @@ stdenv.mkDerivation rec { cat -n .config substituteInPlace Makefile --replace /usr/local $out export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE \ - -I$(echo "${libnl.dev}"/include/libnl*/) \ - -I${pcsclite}/include/PCSC/" + -I$(echo "${stdenv.lib.getDev libnl}"/include/libnl*/) \ + -I${stdenv.lib.getDev pcsclite}/include/PCSC/" ''; buildInputs = [ openssl libnl dbus_libs readline pcsclite ]; |