From 66c41943b334bb02575b04f551f056824319d767 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 23 Jul 2018 17:09:06 -0400 Subject: gnu mig: Remove crossAttrs --- pkgs/os-specific/gnu/mig/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/gnu/mig/default.nix b/pkgs/os-specific/gnu/mig/default.nix index 2855f5b4240f..d138011d595b 100644 --- a/pkgs/os-specific/gnu/mig/default.nix +++ b/pkgs/os-specific/gnu/mig/default.nix @@ -21,13 +21,11 @@ stdenv.mkDerivation { doCheck = true; - crossAttrs = { - postInstall = - # Fix the shebang to point to the cross-built shell. - '' sed -i "$out/bin/mig" \ - -e 's|^#!/.*|#!${bash.crossDrv}/bin/sh|g' - ''; - }; + # Fix the shebang to point to the cross-built shell. Won't be needed + # after #43833. + postInstall = '' + sed -i "$out/bin/mig" -e 's|^#!/.*|#!${bash}/bin/sh|g' + ''; meta = { description = "GNU MIG, the Mach interface generator"; -- cgit 1.4.1 From aa8944f40393a8cdbd92a247adb5ab84a3bcc8af Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 23 Jul 2018 17:11:48 -0400 Subject: hurd: Remove cross attrs --- pkgs/os-specific/gnu/hurd/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/gnu/hurd/default.nix b/pkgs/os-specific/gnu/hurd/default.nix index ae1c504fd19e..a0c4be0ff451 100644 --- a/pkgs/os-specific/gnu/hurd/default.nix +++ b/pkgs/os-specific/gnu/hurd/default.nix @@ -52,7 +52,8 @@ stdenv.mkDerivation ({ done ''; - crossAttrs.dontPatchShebangs = true; + # Not needed after https://github.com/NixOS/nixpkgs/pull/43833 + dontPatchShebangs = stdenv.hostPlatform != stdenv.buildPlatform; meta = { description = "The GNU Hurd, GNU project's replacement for the Unix kernel"; -- cgit 1.4.1 From 1f9838ea344198e2119ed791ea52acedf1f3c6d9 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 23 Jul 2018 16:03:18 -0400 Subject: jom: Remove crossAttrs Untested, but I don't think this has ever built. --- pkgs/os-specific/windows/jom/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/windows/jom/default.nix b/pkgs/os-specific/windows/jom/default.nix index 8befa51566de..1b64ad745991 100644 --- a/pkgs/os-specific/windows/jom/default.nix +++ b/pkgs/os-specific/windows/jom/default.nix @@ -17,13 +17,11 @@ stdenv.mkDerivation { QTDIR = qt48; - crossAttrs = { - # cmakeFlags = "-DWIN32=1 -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_RC_COMPILER=${stdenv.cc.targetPrefix}windres"; - QTDIR = qt48.crossDrv; - preBuild = '' - export NIX_CROSS_CFLAGS_COMPILE=-fpermissive - ''; - }; + # cmakeFlags = "-DWIN32=1 -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_RC_COMPILER=${stdenv.cc.targetPrefix}windres"; + + preBuild = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + export NIX_CROSS_CFLAGS_COMPILE=-fpermissive + ''; meta = { homepage = http://qt-project.org/wiki/jom; -- cgit 1.4.1