mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-04 03:27:38 +03:00
Merge pull request #172044 from trofi/fix-fno-common-for-rox-filer
rox-filer: pull upstream fix for -fno-common toolchains
This commit is contained in:
commit
f7435e73c9
@ -1,6 +1,7 @@
|
|||||||
{ lib
|
{ lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchurl
|
, fetchurl
|
||||||
|
, fetchpatch
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, wrapGAppsHook
|
, wrapGAppsHook
|
||||||
, libxml2
|
, libxml2
|
||||||
@ -27,13 +28,20 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
./rox-filer-2.11-in-source-build.patch
|
./rox-filer-2.11-in-source-build.patch
|
||||||
|
# Pull upstream fix for -fno-common toolchains like upstream gcc-10:
|
||||||
|
# https://github.com/rox-desktop/rox-filer/pull/15
|
||||||
|
(fetchpatch {
|
||||||
|
name = "fno-common.patch";
|
||||||
|
url = "https://github.com/rox-desktop/rox-filer/commit/86b0bb9144186d51ea9b898905111bd8b143b552.patch";
|
||||||
|
sha256 = "1csyx229i09p00lbdlkdqdhn3x2lb5zby1h9rkjgzlr2qz74gc69";
|
||||||
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
# go to the source directory after unpacking the sources
|
# go to the source directory after unpacking the sources
|
||||||
setSourceRoot = "export sourceRoot=rox-filer-${version}/ROX-Filer/";
|
setSourceRoot = "export sourceRoot=rox-filer-${version}/ROX-Filer/";
|
||||||
|
|
||||||
# patch source with defined patches
|
# account for 'setSourceRoot' offset
|
||||||
patchFlags = [ "-p0" ];
|
patchFlags = [ "-p2" ];
|
||||||
|
|
||||||
# patch the main.c to disable the lookup of the APP_DIR environment variable,
|
# patch the main.c to disable the lookup of the APP_DIR environment variable,
|
||||||
# which is used to lookup the location for certain images when rox-filer
|
# which is used to lookup the location for certain images when rox-filer
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
--- src/configure 2011-10-09 16:32:14.000000000 +0200
|
--- a/Rox-Filer/src/configure 2011-10-09 16:32:14.000000000 +0200
|
||||||
+++ src/configure2 2016-03-20 09:26:31.640891863 +0100
|
+++ b/Rox-Filer/src/configure 2016-03-20 09:26:31.640891863 +0100
|
||||||
@@ -2132,13 +2132,6 @@
|
@@ -2132,13 +2132,6 @@
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user