From e79278e4cd9beeb4cdc0c984913888d93aa06cec Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Thu, 14 Feb 2019 21:36:04 +0100 Subject: darwin.architecture: fix sandbox build --- .../darwin/apple-source-releases/architecture/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix b/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix index 4a155a4c403a..ebeb3ef08845 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix @@ -3,6 +3,12 @@ appleDerivation { dontBuild = true; + postPatch = '' + substituteInPlace Makefile \ + --replace '/bin/mkdir' 'mkdir' \ + --replace '/usr/bin/install' 'install' + ''; + installFlags = [ "EXPORT_DSTDIR=/include/architecture" ]; DSTROOT = "$(out)"; -- cgit 1.4.1 From 4893aeae7a52b1236b9231a72dc520797e420935 Mon Sep 17 00:00:00 2001 From: geistesk Date: Sat, 1 Dec 2018 16:46:27 +0100 Subject: usbutils: usbutilsFull with Python3 for lsusb.py --- pkgs/os-specific/linux/usbutils/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix index d58c5a7e67c2..85ef8a1a6ccb 100644 --- a/pkgs/os-specific/linux/usbutils/default.nix +++ b/pkgs/os-specific/linux/usbutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, substituteAll, autoreconfHook, pkgconfig, libusb1, hwdata }: +{ stdenv, fetchurl, substituteAll, autoreconfHook, pkgconfig, libusb1, hwdata , python3 }: stdenv.mkDerivation rec { name = "usbutils-010"; @@ -16,7 +16,12 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ libusb1 ]; + buildInputs = [ libusb1 python3 ]; + + outputs = [ "out" "man" "python" ]; + postInstall = '' + moveToOutput "bin/lsusb.py" "$python" + ''; meta = with stdenv.lib; { homepage = http://www.linux-usb.org/; -- cgit 1.4.1 From f84aef11a4cea741b68e2966f5f189320708bc60 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 17 Feb 2019 10:03:26 +0100 Subject: Revert "darwin.architecture: fix sandbox build" Moving changes to staging, this is a mass-rebuild. This reverts commit e79278e4cd9beeb4cdc0c984913888d93aa06cec. --- .../darwin/apple-source-releases/architecture/default.nix | 6 ------ 1 file changed, 6 deletions(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix b/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix index ebeb3ef08845..4a155a4c403a 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix @@ -3,12 +3,6 @@ appleDerivation { dontBuild = true; - postPatch = '' - substituteInPlace Makefile \ - --replace '/bin/mkdir' 'mkdir' \ - --replace '/usr/bin/install' 'install' - ''; - installFlags = [ "EXPORT_DSTDIR=/include/architecture" ]; DSTROOT = "$(out)"; -- cgit 1.4.1