sxmo-utils: fix incorrect PREFIX
this should help the appscripts (screenshotting and the like)
This commit is contained in:
parent
e01b1f35fc
commit
18c940962e
|
@ -127,8 +127,12 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [ bash ]; # needed here so stdenv's `patchShebangsAuto` hook sets the right interpreter
|
||||
|
||||
# TODO: DESTDIR/PREFIX here are wrong, and it breaks share/sxmo/appscripts/{sxmo_screenshot.sh,...}
|
||||
makeFlags = [ "OPENRC=0" "DESTDIR=${placeholder "out"}" "PREFIX=" ];
|
||||
makeFlags = [
|
||||
"PREFIX=${placeholder "out"}"
|
||||
"SYSCONFDIR=${placeholder "out"}/etc"
|
||||
"DESTDIR="
|
||||
"OPENRC=0"
|
||||
];
|
||||
preInstall = ''
|
||||
# busybox is used by setup_config_version.sh, but placing it in nativeBuildInputs breaks the nix builder
|
||||
PATH="$PATH:${buildPackages.busybox}/bin"
|
||||
|
|
|
@ -70,6 +70,11 @@ let
|
|||
url = "https://git.uninsane.org/colin/sxmo-utils/commit/8949c64451973212a8aa50375396ec375c676d1e.patch";
|
||||
hash = "sha256-Okjjwa2FBJOrDVZGrfaUEPGQY749+V4w0gALIBp50hQ=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "Makefile: use SYSCONFDIR instead of hardcoding /etc";
|
||||
url = "https://git.uninsane.org/colin/sxmo-utils/commit/bbad10e074c335710e5ab171a0b1d96dddf160ed.patch";
|
||||
hash = "sha256-jqxzGLjYXuJV6NB/4zsPdjuzNVyUCxPSlGMDW5XetZ8=";
|
||||
})
|
||||
|
||||
## these might or might not be upstream-worthy
|
||||
./0104-full-auto-rotate.patch
|
||||
|
|
Loading…
Reference in New Issue
Block a user