nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 08:53:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #172044 from trofi/fix-fno-common-for-rox-filer

Browse Source 
rox-filer: pull upstream fix for -fno-common toolchains
This commit is contained in:
Jörg Thalheim 2022-05-08 10:41:36 +01:00 committed by GitHub
commit f7435e73c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/desktops/rox/rox-filer/default.nix
View File

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchurl
, fetchpatch
, pkg-config
, wrapGAppsHook
, libxml2
@ -27,13 +28,20 @@ stdenv.mkDerivation rec {
patches = [
./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
setSourceRoot = "export sourceRoot=rox-filer-${version}/ROX-Filer/";
# patch source with defined patches
patchFlags = [ "-p0" ];
# account for 'setSourceRoot' offset
patchFlags = [ "-p2" ];
# 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

4
pkgs/desktops/rox/rox-filer/rox-filer-2.11-in-source-build.patch
View File

@ -1,5 +1,5 @@
--- src/configure 2011-10-09 16:32:14.000000000 +0200
+++ src/configure2 2016-03-20 09:26:31.640891863 +0100
--- a/Rox-Filer/src/configure 2011-10-09 16:32:14.000000000 +0200
+++ b/Rox-Filer/src/configure 2016-03-20 09:26:31.640891863 +0100
@@ -2132,13 +2132,6 @@