diff options
| author | Robin Gloster <mail@glob.in> | 2019-05-07 20:35:47 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-07 20:35:47 +0000 |
| commit | f41599a028d2743825b1de3cb5866e8e826ae221 (patch) | |
| tree | f29a5b29876d97296a6b1889f4a0d872a745fafa /pkgs/applications | |
| parent | 87a5d8fedeb4949234a84206f3da9f3d882d1111 (diff) | |
| parent | 4a246cea2867b0012a0fae2949b3d87127f73bb2 (diff) | |
| download | nixlib-f41599a028d2743825b1de3cb5866e8e826ae221.tar nixlib-f41599a028d2743825b1de3cb5866e8e826ae221.tar.gz nixlib-f41599a028d2743825b1de3cb5866e8e826ae221.tar.bz2 nixlib-f41599a028d2743825b1de3cb5866e8e826ae221.tar.lz nixlib-f41599a028d2743825b1de3cb5866e8e826ae221.tar.xz nixlib-f41599a028d2743825b1de3cb5866e8e826ae221.tar.zst nixlib-f41599a028d2743825b1de3cb5866e8e826ae221.zip | |
Merge pull request #61086 from mayflower/cross-fixes
Batch of cross compilation fixes
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/audio/cdparanoia/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/misc/dmenu/default.nix | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix index c419d141d1ba..4e517ee636e8 100644 --- a/pkgs/applications/audio/cdparanoia/default.nix +++ b/pkgs/applications/audio/cdparanoia/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./utils.patch ++ [./fix_private_keyword.patch]; - buildInputs = stdenv.lib.optional stdenv.isAarch64 autoreconfHook; + nativeBuildInputs = stdenv.lib.optional stdenv.isAarch64 autoreconfHook; propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ Carbon @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - preConfigure = "unset CC" + stdenv.lib.optionalString stdenv.isAarch64 ''\n + preConfigure = "unset CC" + stdenv.lib.optionalString stdenv.isAarch64 ''; cp ${gnu-config}/config.sub configure.sub cp ${gnu-config}/config.guess configure.guess ''; diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix index 90754b8fb1d8..e6b62817b907 100644 --- a/pkgs/applications/misc/dmenu/default.nix +++ b/pkgs/applications/misc/dmenu/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk ''; + makeFlags = [ "CC:=$(CC)" ]; + meta = with stdenv.lib; { description = "A generic, highly customizable, and efficient menu for the X Window System"; homepage = https://tools.suckless.org/dmenu; |