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

Merge pull request #33577 from dtzWill/fix/cross-2

Browse Source 
Minor cross fixes, 2
This commit is contained in:
John Ericson 2018-01-09 12:36:53 -05:00 committed by GitHub
commit eec050f395
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/lib/make-ext4-fs.nix
View File

@ -10,7 +10,7 @@
pkgs.stdenv.mkDerivation { pkgs.stdenv.mkDerivation {
name = "ext4-fs.img"; name = "ext4-fs.img";
buildInputs = with pkgs; [e2fsprogs libfaketime perl]; nativeBuildInputs = with pkgs; [e2fsprogs libfaketime perl];
# For obtaining the closure of `storePaths'. # For obtaining the closure of `storePaths'.
exportReferencesGraph = exportReferencesGraph =

2
nixos/lib/make-squashfs.nix
View File

@ -8,7 +8,7 @@
stdenv.mkDerivation { stdenv.mkDerivation {
name = "squashfs.img"; name = "squashfs.img";
buildInputs = [perl squashfsTools]; nativeBuildInputs = [perl squashfsTools];
# For obtaining the closure of `storeContents'. # For obtaining the closure of `storeContents'.
exportReferencesGraph = exportReferencesGraph =

4
nixos/modules/security/wrappers/default.nix
View File

@ -17,7 +17,7 @@ let
hardeningEnable = [ "pie" ]; hardeningEnable = [ "pie" ];
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
gcc -Wall -O2 -DWRAPPER_DIR=\"${parentWrapperDir}\" \ $CC -Wall -O2 -DWRAPPER_DIR=\"${parentWrapperDir}\" \
-lcap-ng -lcap ${./wrapper.c} -o $out/bin/security-wrapper -lcap-ng -lcap ${./wrapper.c} -o $out/bin/security-wrapper
''; '';
}; };
@ -79,7 +79,7 @@ let
({ owner = "root"; ({ owner = "root";
group = "root"; group = "root";
} // s) } // s)
else if else if
(s ? "setuid" && s.setuid) || (s ? "setuid" && s.setuid) ||
(s ? "setgid" && s.setgid) || (s ? "setgid" && s.setgid) ||
(s ? "permissions") (s ? "permissions")

2
pkgs/os-specific/linux/mdadm/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
# This is to avoid self-references, which causes the initrd to explode # This is to avoid self-references, which causes the initrd to explode
# in size and in turn prevents mdraid systems from booting. # in size and in turn prevents mdraid systems from booting.
allowedReferences = [ stdenv.glibc.out ]; allowedReferences = [ stdenv.cc.libc.out ];
patches = [ ./no-self-references.patch ]; patches = [ ./no-self-references.patch ];

4
pkgs/tools/misc/ms-sys/default.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ms-sys-${version}"; name = "ms-sys-${version}";
version = "2.5.3"; version = "2.5.3";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/ms-sys/${name}.tar.gz"; url = "mirror://sourceforge/ms-sys/${name}.tar.gz";
sha256 = "0mijf82cbji4laip6hiy3l5ka5mzq5sivjvyv7wxnc2fd3v7hgp0"; sha256 = "0mijf82cbji4laip6hiy3l5ka5mzq5sivjvyv7wxnc2fd3v7hgp0";
}; };
buildInputs = [ gettext ]; nativeBuildInputs = [ gettext ];
enableParallelBuilding = true; enableParallelBuilding = true;

1
pkgs/tools/system/ddrescue/default.nix
View File

@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ lzip ]; nativeBuildInputs = [ lzip ];
doCheck = hostPlatform == buildPlatform; doCheck = hostPlatform == buildPlatform;
configureFlags = [ "CXX=${stdenv.cc.targetPrefix}c++" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "GNU ddrescue, a data recovery tool"; description = "GNU ddrescue, a data recovery tool";