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

Merge pull request #52702 from jtojnar/boo-destdir 

Boo destdir
This commit is contained in:
Jan Tojnar 2018-12-22 23:02:23 +01:00 committed by GitHub
parent 110038afca 8d42600921
commit 9086af1a77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 34 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/browsers/surf/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
inherit patches; inherit patches;
installFlags = [ "PREFIX=/" "DESTDIR=$(out)" ]; installFlags = [ "PREFIX=$(out)" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A simple web browser based on WebKit/GTK+"; description = "A simple web browser based on WebKit/GTK+";

7
pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix
View File

@ -13,9 +13,10 @@ stdenv.mkDerivation {
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
}; };
makeFlags = "PURPLE_LIBDIR=lib PURPLE_DATADIR=share/data DESTDIR=$$out"; makeFlags = [
preInstall = "mkdir -p \$out/share"; "PURPLE_LIBDIR=${placeholder "out"}/lib"
postInstall = "ln -s \$out/lib/purple-2 \$out/share/pidgin-msn-pecan"; "PURPLE_DATADIR=${placeholder "out"}/share/data"
];
buildInputs = [pidgin]; buildInputs = [pidgin];
} }

11
pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix
View File

@ -15,13 +15,16 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ pidgin ]; buildInputs = [ pidgin ];
preConfigure = '' postPatch = ''
sed -i 's|-I/usr/include/libpurple|$(shell pkg-config --cflags purple)|' Makefile sed -i 's|-I/usr/include/libpurple|$(shell pkg-config --cflags purple)|' Makefile
export DESTDIR=$out
export LIBDIR=/lib
export DATADIR=/share
''; '';
makeFlags = [
"DESTDIR=/"
"LIBDIR=${placeholder "out"}/lib"
"DATADIR=${placeholder "out"}/share"
];
meta = { meta = {
homepage = https://github.com/dreadatour/pidgin-mra; homepage = https://github.com/dreadatour/pidgin-mra;
description = "Mail.ru Agent plugin for Pidgin / libpurple"; description = "Mail.ru Agent plugin for Pidgin / libpurple";

9
pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pidgin, unzip, glib, json-glib, nss, nspr, libgnome-keyring } : { stdenv, fetchFromGitHub, pidgin, glib, json-glib, nss, nspr, libgnome-keyring } :
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pidgin-opensteamworks-${version}"; name = "pidgin-opensteamworks-${version}";
@ -13,12 +13,11 @@ stdenv.mkDerivation rec {
preConfigure = "cd steam-mobile"; preConfigure = "cd steam-mobile";
installFlags = [ installFlags = [
"DESTDIR=$(out)" "PLUGIN_DIR_PURPLE=${placeholder "out"}/lib/purple-2"
"PLUGIN_DIR_PURPLE=/lib/purple-2" "DATA_ROOT_DIR_PURPLE=${placeholder "out"}/share"
"DATA_ROOT_DIR_PURPLE=/share"
]; ];
buildInputs = [ pidgin unzip glib json-glib nss nspr libgnome-keyring ]; buildInputs = [ pidgin glib json-glib nss nspr libgnome-keyring ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/EionRobb/pidgin-opensteamworks; homepage = https://github.com/EionRobb/pidgin-opensteamworks;

15
pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pidgin-skypeweb-${version}"; name = "pidgin-skypeweb-${version}";
version = "1.2.2"; version = "1.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "EionRobb"; owner = "EionRobb";
repo = "skype4pidgin"; repo = "skype4pidgin";
rev = "${version}"; rev = version;
sha256 = "1lxpz316jmns6i143v4j6sd6k0a4a54alw08rvwjckf2rig57lj2"; sha256 = "1bd9gd36yhrbrww0dvai9rnzxxj1c9sb4003c72wg27w12y47xfv";
}; };
setSourceRoot = '' setSourceRoot = ''
@ -18,13 +18,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ pidgin json-glib ]; buildInputs = [ pidgin json-glib ];
makeFlags = [ PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2";
"PLUGIN_DIR_PURPLE=/lib/pidgin/" PKG_CONFIG_PURPLE_DATADIR = "${placeholder "out"}/share";
"DATA_ROOT_DIR_PURPLE=/share"
"DESTDIR=$(out)"
];
postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-skypeweb";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/EionRobb/skype4pidgin; homepage = https://github.com/EionRobb/skype4pidgin;

8
pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix
View File

@ -14,12 +14,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ pidgin json-glib ]; buildInputs = [ pidgin json-glib ];
makeFlags = [ PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2";
"DESTDIR=$(out)" PKG_CONFIG_PURPLE_DATADIR = "${placeholder "out"}/share";
];
PKG_CONFIG_PURPLE_PLUGINDIR = "/lib/purple-2";
PKG_CONFIG_PURPLE_DATADIR = "/share";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/EionRobb/purple-discord; homepage = https://github.com/EionRobb/purple-discord;

5
pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix
View File

@ -18,9 +18,8 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "fortify" ]; # upstream compiles with -O0 hardeningDisable = [ "fortify" ]; # upstream compiles with -O0
makeFlags = [ makeFlags = [
"DESTDIR=$(out)" "PLUGIN_DIR_PURPLE=${placeholder "out"}/lib/purple-2"
"PLUGIN_DIR_PURPLE=/lib/pidgin/" "DATA_ROOT_DIR_PURPLE=${placeholder "out"}/share"
"DATA_ROOT_DIR_PURPLE=/share"
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

2
pkgs/tools/filesystems/duperemove/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libgcrypt glib linuxHeaders sqlite ]; buildInputs = [ libgcrypt glib linuxHeaders sqlite ];
makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; makeFlags = [ "PREFIX=${placeholder "out"}" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A simple tool for finding duplicated extents and submitting them for deduplication"; description = "A simple tool for finding duplicated extents and submitting them for deduplication";

11
pkgs/tools/networking/tgt/default.nix
View File

@ -15,9 +15,14 @@ in stdenv.mkDerivation rec {
buildInputs = [ libxslt systemd libaio docbook_xsl ]; buildInputs = [ libxslt systemd libaio docbook_xsl ];
DESTDIR = "$(out)"; makeFlags = [
PREFIX = "/"; "PREFIX=${placeholder "out"}"
SD_NOTIFY="1"; "SD_NOTIFY=1"
];
installFlags = [
"sysconfdir=${placeholder "out"}/etc"
];
preConfigure = '' preConfigure = ''
sed -i 's|/usr/bin/||' doc/Makefile sed -i 's|/usr/bin/||' doc/Makefile